chart: Set admin metrics port to http port (#7936)
* chart: Set admin metrics port to http port * remove metrics reference
This commit is contained in:
@@ -25,12 +25,6 @@ spec:
|
|||||||
port: {{ .Values.admin.grpcPort }}
|
port: {{ .Values.admin.grpcPort }}
|
||||||
targetPort: {{ .Values.admin.grpcPort }}
|
targetPort: {{ .Values.admin.grpcPort }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
{{- if .Values.admin.metricsPort }}
|
|
||||||
- name: "metrics"
|
|
||||||
port: {{ .Values.admin.metricsPort }}
|
|
||||||
targetPort: {{ .Values.admin.metricsPort }}
|
|
||||||
protocol: TCP
|
|
||||||
{{- end }}
|
|
||||||
selector:
|
selector:
|
||||||
app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
|
app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
|
||||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
{{- if .Values.admin.enabled }}
|
{{- if .Values.admin.enabled }}
|
||||||
{{- if .Values.admin.metricsPort }}
|
|
||||||
{{- if .Values.global.monitoring.enabled }}
|
{{- if .Values.global.monitoring.enabled }}
|
||||||
apiVersion: monitoring.coreos.com/v1
|
apiVersion: monitoring.coreos.com/v1
|
||||||
kind: ServiceMonitor
|
kind: ServiceMonitor
|
||||||
@@ -22,7 +21,7 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
endpoints:
|
endpoints:
|
||||||
- interval: 30s
|
- interval: 30s
|
||||||
port: metrics
|
port: http
|
||||||
scrapeTimeout: 5s
|
scrapeTimeout: 5s
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
@@ -30,4 +29,3 @@ spec:
|
|||||||
app.kubernetes.io/component: admin
|
app.kubernetes.io/component: admin
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
|
||||||
|
|||||||
@@ -213,10 +213,6 @@ spec:
|
|||||||
name: http
|
name: http
|
||||||
- containerPort: {{ .Values.admin.grpcPort }}
|
- containerPort: {{ .Values.admin.grpcPort }}
|
||||||
name: grpc
|
name: grpc
|
||||||
{{- if .Values.admin.metricsPort }}
|
|
||||||
- containerPort: {{ .Values.admin.metricsPort }}
|
|
||||||
name: metrics
|
|
||||||
{{- end }}
|
|
||||||
{{- if .Values.admin.readinessProbe.enabled }}
|
{{- if .Values.admin.readinessProbe.enabled }}
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
|
|||||||
@@ -1099,7 +1099,6 @@ admin:
|
|||||||
replicas: 1
|
replicas: 1
|
||||||
port: 23646 # Default admin port
|
port: 23646 # Default admin port
|
||||||
grpcPort: 33646 # Default gRPC port for worker connections
|
grpcPort: 33646 # Default gRPC port for worker connections
|
||||||
metricsPort: 9327
|
|
||||||
loggingOverrideLevel: null
|
loggingOverrideLevel: null
|
||||||
|
|
||||||
# Admin authentication
|
# Admin authentication
|
||||||
|
|||||||
Reference in New Issue
Block a user