Browse Source

chart: Set admin metrics port to http port (#7936)

* chart: Set admin metrics port to http port

* remove metrics reference
pull/7938/head
Sheya Bernstein 1 week ago
committed by GitHub
parent
commit
c0188db7cc
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 6
      k8s/charts/seaweedfs/templates/admin/admin-service.yaml
  2. 4
      k8s/charts/seaweedfs/templates/admin/admin-servicemonitor.yaml
  3. 4
      k8s/charts/seaweedfs/templates/admin/admin-statefulset.yaml
  4. 1
      k8s/charts/seaweedfs/values.yaml

6
k8s/charts/seaweedfs/templates/admin/admin-service.yaml

@ -25,12 +25,6 @@ spec:
port: {{ .Values.admin.grpcPort }}
targetPort: {{ .Values.admin.grpcPort }}
protocol: TCP
{{- if .Values.admin.metricsPort }}
- name: "metrics"
port: {{ .Values.admin.metricsPort }}
targetPort: {{ .Values.admin.metricsPort }}
protocol: TCP
{{- end }}
selector:
app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

4
k8s/charts/seaweedfs/templates/admin/admin-servicemonitor.yaml

@ -1,5 +1,4 @@
{{- if .Values.admin.enabled }}
{{- if .Values.admin.metricsPort }}
{{- if .Values.global.monitoring.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
@ -22,7 +21,7 @@ metadata:
spec:
endpoints:
- interval: 30s
port: metrics
port: http
scrapeTimeout: 5s
selector:
matchLabels:
@ -30,4 +29,3 @@ spec:
app.kubernetes.io/component: admin
{{- end }}
{{- end }}
{{- end }}

4
k8s/charts/seaweedfs/templates/admin/admin-statefulset.yaml

@ -213,10 +213,6 @@ spec:
name: http
- containerPort: {{ .Values.admin.grpcPort }}
name: grpc
{{- if .Values.admin.metricsPort }}
- containerPort: {{ .Values.admin.metricsPort }}
name: metrics
{{- end }}
{{- if .Values.admin.readinessProbe.enabled }}
readinessProbe:
httpGet:

1
k8s/charts/seaweedfs/values.yaml

@ -1099,7 +1099,6 @@ admin:
replicas: 1
port: 23646 # Default admin port
grpcPort: 33646 # Default gRPC port for worker connections
metricsPort: 9327
loggingOverrideLevel: null
# Admin authentication

Loading…
Cancel
Save