feat(CSI-303): add metrics and livenessProbe to attacher sidecar

weka · Oct 30, 2024 · b544a22 · b544a22
1 parent 8318831
commit b544a22
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/charts/csi-wekafsplugin/templates/controllerserver-deployment.yaml b/charts/csi-wekafsplugin/templates/controllerserver-deployment.yaml
@@ -22,7 +22,7 @@ spec:
       annotations:
         prometheus.io/scrape: 'true'
         prometheus.io/path: '/metrics'
-        prometheus.io/port: '{{ .Values.metrics.controllerPort | default 9090 }},{{ .Values.metrics.provisionerPort | default 9091 }},{{ .Values.metrics.resizerPort | default 9092 }},{{ .Values.metrics.snapshotterPort | default 9093 }}'
+        prometheus.io/port: '{{ .Values.metrics.controllerPort | default 9090 }},{{ .Values.metrics.provisionerPort | default 9091 }},{{ .Values.metrics.resizerPort | default 9092 }},{{ .Values.metrics.snapshotterPort | default 9093 }},{{ .Values.metrics.attacherPort | default 9095 }}'
     {{- end }}
     spec:
       {{- if or .Values.controller.affinity .Values.affinity }}
@@ -176,15 +176,30 @@ spec:
             - "--csi-address=$(ADDRESS)"
             - "--v={{ .Values.logLevel | default 5 }}"
             - "--timeout=60s"
+            {{- if .Values.controller.configureAttacherLeaderElection }}
             - "--leader-election"
             - "--leader-election-namespace={{ .Release.Namespace }}"
+            {{- end }}
             - "--worker-threads={{ .Values.controller.maxConcurrentRequests }}"
+            {{- if or .Values.metrics.enabled .Values.controller.configureAttacherLeaderElection }}
+            - "--http-endpoint=:{{ .Values.metrics.attacherPort | default 9095 }}"
+            {{- end }}
           env:
             - name: ADDRESS
               value: unix:///csi/csi.sock
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
+          {{- if .Values.controller.configureAttacherLeaderElection }}
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.metrics.attacherPort | default 9095 }}
+              path: /healthz/leader-election
+          ports:
+            - containerPort: {{ .Values.metrics.attacherPort | default 9095 }}
+              name: pr-metrics
+              protocol: TCP
+          {{- end }}
         - name: csi-provisioner
           {{- if and .Values.hostNetwork (.Capabilities.APIVersions.Has "security.openshift.io/v1/SecurityContextConstraints") }}
           securityContext:

diff --git a/charts/csi-wekafsplugin/values.yaml b/charts/csi-wekafsplugin/values.yaml
@@ -69,6 +69,8 @@ controller:
   configureResizerLeaderElection: true
   # -- Configure snapshotter sidecar for leader election
   configureSnapshotterLeaderElection: true
+  # -- Configure attacher sidecar for leader election
+  configureAttacherLeaderElection: true
   # -- optional nodeSelector for controller components only
   nodeSelector: {}
   # -- optional affinity for controller components only
@@ -121,6 +123,8 @@ metrics:
   snapshotterPort: 9093
   # -- Metrics port for Node Serer
   nodePort: 9094
+  # -- Attacher metrics port
+  attacherPort: 9095
 # -- Tracing URL (For Jaeger tracing engine / OpenTelemetry), optional
 # @ignore
 tracingUrl: ""