From e24b9ef9f2d772d5e9f61e105cc962655b3b116a Mon Sep 17 00:00:00 2001 From: Aniruddha Basak Date: Wed, 17 Jun 2026 15:06:27 +0200 Subject: [PATCH 1/5] add metrics endpoint for csi --- .../templates/deployment-csi-driver-controller.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/deployment-csi-driver-controller.yaml b/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/deployment-csi-driver-controller.yaml index f232ebd4..7992a0bf 100644 --- a/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/deployment-csi-driver-controller.yaml +++ b/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/deployment-csi-driver-controller.yaml @@ -80,6 +80,10 @@ spec: - name: healthz containerPort: {{ .Values.healthzPort }} protocol: TCP + - containerPort: 9090 + hostPort: 9090 + name: metrics + protocol: TCP livenessProbe: httpGet: path: /healthz From 9197917247f5ec187e1ec65eb5db543ef524a367 Mon Sep 17 00:00:00 2001 From: Aniruddha Basak Date: Wed, 17 Jun 2026 15:59:29 +0200 Subject: [PATCH 2/5] add metrics address in csi driver deployment arg # Conflicts: # charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/deployment-csi-driver-controller.yaml --- .../templates/deployment-csi-driver-controller.yaml | 1 + .../charts/stackit-blockstorage-csi-driver/values.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/deployment-csi-driver-controller.yaml b/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/deployment-csi-driver-controller.yaml index 7992a0bf..cd5fba87 100644 --- a/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/deployment-csi-driver-controller.yaml +++ b/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/deployment-csi-driver-controller.yaml @@ -52,6 +52,7 @@ spec: {{- end }} - --v=3 - --provide-node-service=false + - --metrics-address=:{{ .Values.config.metricsPort }} {{- if .Values.csi.enableCompatibilityMode }} - --legacy-storage-mode=true {{- end }} diff --git a/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/values.yaml b/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/values.yaml index cf5a4243..3d920c90 100644 --- a/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/values.yaml +++ b/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/values.yaml @@ -1,4 +1,6 @@ replicas: 1 +config: + metricsPort: 9090 podAnnotations: {} kubernetesVersion: 1.30.0 prefix: stackit-blockstorage From 398d3ba3a5061dcf18a339437c8257f7c5c043bd Mon Sep 17 00:00:00 2001 From: Aniruddha Basak Date: Thu, 18 Jun 2026 11:40:07 +0200 Subject: [PATCH 3/5] add variable in metric port --- .../templates/deployment-csi-driver-controller.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/deployment-csi-driver-controller.yaml b/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/deployment-csi-driver-controller.yaml index cd5fba87..5b2cecb2 100644 --- a/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/deployment-csi-driver-controller.yaml +++ b/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/deployment-csi-driver-controller.yaml @@ -81,8 +81,8 @@ spec: - name: healthz containerPort: {{ .Values.healthzPort }} protocol: TCP - - containerPort: 9090 - hostPort: 9090 + - containerPort: {{ .Values.config.metricsPort }} + hostPort: {{ .Values.config.metricsPort }} name: metrics protocol: TCP livenessProbe: From 1c9143e0fe62b5f00cef7142d684604c58579833 Mon Sep 17 00:00:00 2001 From: Aniruddha Basak Date: Mon, 22 Jun 2026 15:30:26 +0200 Subject: [PATCH 4/5] expose metrics port via service --- .../deployment-csi-driver-controller.yaml | 1 - .../templates/service.yaml | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/service.yaml diff --git a/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/deployment-csi-driver-controller.yaml b/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/deployment-csi-driver-controller.yaml index 5b2cecb2..15f1bf0f 100644 --- a/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/deployment-csi-driver-controller.yaml +++ b/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/deployment-csi-driver-controller.yaml @@ -82,7 +82,6 @@ spec: containerPort: {{ .Values.healthzPort }} protocol: TCP - containerPort: {{ .Values.config.metricsPort }} - hostPort: {{ .Values.config.metricsPort }} name: metrics protocol: TCP livenessProbe: diff --git a/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/service.yaml b/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/service.yaml new file mode 100644 index 00000000..52cdbd15 --- /dev/null +++ b/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/service.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: {{ .Values.prefix }}-csi + role: controller + name: {{ .Values.prefix }}-csi-driver-controller + namespace: {{ .Release.Namespace }} +spec: + ports: + - name: metrics + port: 8080 + targetPort: metrics + protocol: TCP + selector: + app: {{ .Values.prefix }}-csi + role: controller + type: ClusterIP From b44af7a2081e36e583691c2744f6bb0c05244442 Mon Sep 17 00:00:00 2001 From: Aniruddha Basak Date: Wed, 1 Jul 2026 10:11:39 +0200 Subject: [PATCH 5/5] add annotation to service --- .../stackit-blockstorage-csi-driver/templates/service.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/service.yaml b/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/service.yaml index 52cdbd15..416069ed 100644 --- a/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/service.yaml +++ b/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/service.yaml @@ -1,6 +1,8 @@ apiVersion: v1 kind: Service metadata: + annotations: + networking.resources.gardener.cloud/from-all-scrape-targets-allowed-ports: '[{"port":{{ .Values.config.metricsPort }},"protocol":"TCP"}]' labels: app: {{ .Values.prefix }}-csi role: controller @@ -9,7 +11,7 @@ metadata: spec: ports: - name: metrics - port: 8080 + port: {{ .Values.config.metricsPort }} targetPort: metrics protocol: TCP selector: