fix(CSI-241): conflict in metrics between node and controller

weka · Sep 12, 2024 · f9e96f7 · f9e96f7
1 parent d581918
commit f9e96f7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/charts/csi-wekafsplugin/templates/controllerserver-statefulset.yaml b/charts/csi-wekafsplugin/templates/controllerserver-statefulset.yaml
@@ -23,7 +23,7 @@ spec:
  annotations:
  prometheus.io/scrape: 'true'
  prometheus.io/path: '/metrics'
- prometheus.io/port: '{{ .Values.metrics.port | default 9090 }}'
+ prometheus.io/port: '{{ .Values.metrics.controllerPort | default 9090 }},{{ .Values.metrics.provisionerPort | default 9091 }},{{ .Values.metrics.resizerPort | default 9092 }},{{ .Values.metrics.snapshotterPort | default 9093 }}'
  {{- end }}
  spec:
  {{- if .Values.nodeSelector }}
@@ -192,7 +192,7 @@ spec:
  {{- end }}
  {{- if .Values.metrics.enabled }}
  - "--enablemetrics"
- - "--metricsport={{ .Values.metrics.port | default 9090 }}"
+ - "--metricsport={{ .Values.metrics.controllerPort | default 9090 }}"
  {{- end }}
  {{- if .Values.pluginConfig.allowInsecureHttps }}
  - "--allowinsecurehttps"
@@ -229,7 +229,7 @@ spec:
  name: healthz
  protocol: TCP
  {{- if .Values.metrics.enabled }}
- - containerPort: {{ .Values.metrics.port }}
+ - containerPort: {{ .Values.metrics.controllerPort | default 9090 }}
  name: metrics
  protocol: TCP
  {{- end }}

diff --git a/charts/csi-wekafsplugin/templates/nodeserver-daemonset.yaml b/charts/csi-wekafsplugin/templates/nodeserver-daemonset.yaml
@@ -17,7 +17,7 @@ spec:
  annotations:
  prometheus.io/scrape: 'true'
  prometheus.io/path: '/metrics'
- prometheus.io/port: '{{ .Values.metrics.port | default 9090 }}'
+ prometheus.io/port: '{{ .Values.metrics.nodePort | default 9090 }}'
  {{- end }}
  spec:
  {{- if (eq .Values.selinuxSupport "mixed")}}
@@ -86,7 +86,7 @@ spec:
  {{- end }}
  {{- if .Values.metrics.enabled }}
  - "--enablemetrics"
- - "--metricsport={{ .Values.metrics.port | default 9090 }}"
+ - "--metricsport={{ .Values.metrics.nodePort | default 9090 }}"
  {{- end }}
  {{- if .Values.pluginConfig.allowInsecureHttps }}
  - "--allowinsecurehttps"
@@ -120,7 +120,7 @@ spec:
  name: healthz
  protocol: TCP
  {{- if .Values.metrics.enabled }}
- - containerPort: {{ .Values.metrics.port }}
+ - containerPort: {{ .Values.metrics.nodePort }}
  name: metrics
  protocol: TCP
  {{- end }}

diff --git a/charts/csi-wekafsplugin/values.yaml b/charts/csi-wekafsplugin/values.yaml
@@ -96,14 +96,16 @@ kubeletPath: "/var/lib/kubelet"
 metrics:
  # -- Enable Prometheus Metrics
  enabled: true
- # -- Metrics port
- port: 9090
+ # -- Metrics port for Controller Server
+ controllerPort: 9090
  # -- Provisioner metrics port
  provisionerPort: 9091
  # -- Resizer metrics port
  resizerPort: 9092
  # -- Snapshotter metrics port
  snapshotterPort: 9093
+ # -- Metrics port for Node Serer
+ nodePort: 9094
 # -- Tracing URL (For Jaeger tracing engine / OpenTelemetry), optional
 # @ignore
 tracingUrl: ""