From 225b7f72f2af3b6e8fb424810233f47b5401ded5 Mon Sep 17 00:00:00 2001
From: 1602077 <1602077@users.noreply.github.com>
Date: Wed, 11 Feb 2026 06:30:56 +0100
Subject: [PATCH 1/3] feat(manila-csi): allow cluster-id to be pulled from env
 variables

Signed-off-by: Jack Charlie Munday <1602077@users.noreply.github.com>
---
 .../templates/controllerplugin-statefulset.yaml        | 10 +++++++++-
 .../templates/nodeplugin-daemonset.yaml                |  6 +++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/charts/manila-csi-plugin/templates/controllerplugin-statefulset.yaml b/charts/manila-csi-plugin/templates/controllerplugin-statefulset.yaml
index d38911b7fb..7a663e23b8 100644
--- a/charts/manila-csi-plugin/templates/controllerplugin-statefulset.yaml
+++ b/charts/manila-csi-plugin/templates/controllerplugin-statefulset.yaml
@@ -101,7 +101,7 @@ spec:
             {{- if .compatibilitySettings }}
             --compatibility-settings={{ .compatibilitySettings }}
             {{- end }}
-            --cluster-id="{{ $.Values.csimanila.clusterID }}"
+            --cluster-id=$(CLUSTER_NAME)
             {{- if $.Values.csimanila.pvcAnnotations }}
             --pvc-annotations
             {{- end }}'
@@ -115,9 +115,17 @@ spec:
               value: "unix://{{ .fwdNodePluginEndpoint.dir }}/{{ .fwdNodePluginEndpoint.sockFile }}"
             - name: MANILA_SHARE_PROTO
               value: "{{ .protocolSelector }}"
+            {{- if $.Values.csimanila.clusterID }}
+            - name: CLUSTER_NAME
+              value: {{ $.Values.csimanila.clusterID }}
+            {{- end }}
             {{- if $.Values.controllerplugin.nodeplugin.extraEnv }}
               {{- toYaml $.Values.controllerplugin.nodeplugin.extraEnv | nindent 12 }}
             {{- end }}
+          {{- with $.Values.controllerplugin.nodeplugin.envFrom }}
+          envFrom:
+          {{- toYaml . | nindent 12 }}
+          {{- end }}
           imagePullPolicy: {{ $.Values.csimanila.image.pullPolicy }}
           volumeMounts:
             - name: {{ .protocolSelector | lower }}-plugin-dir
diff --git a/charts/manila-csi-plugin/templates/nodeplugin-daemonset.yaml b/charts/manila-csi-plugin/templates/nodeplugin-daemonset.yaml
index c8c9acf77c..b820b8301a 100644
--- a/charts/manila-csi-plugin/templates/nodeplugin-daemonset.yaml
+++ b/charts/manila-csi-plugin/templates/nodeplugin-daemonset.yaml
@@ -62,7 +62,7 @@ spec:
             --drivername=$(DRIVER_NAME)
             --share-protocol-selector=$(MANILA_SHARE_PROTO)
             --fwdendpoint=$(FWD_CSI_ENDPOINT)
-            --cluster-id="{{ $.Values.csimanila.clusterID }}"'
+            --cluster-id=$(CLUSTER_NAME)'
           ]
           env:
             - name: DRIVER_NAME
@@ -73,6 +73,10 @@ spec:
               value: "unix://{{ .fwdNodePluginEndpoint.dir }}/{{ .fwdNodePluginEndpoint.sockFile }}"
             - name: MANILA_SHARE_PROTO
               value: "{{ .protocolSelector }}"
+            {{- if $.Values.csimanila.clusterID }}
+            - name: CLUSTER_NAME
+              value: "{{ $.Values.csimanila.clusterID }}"
+            {{- end }}
             {{- if $.Values.nodeplugin.nodeplugin.extraEnv }}
               {{- toYaml $.Values.nodeplugin.nodeplugin.extraEnv | nindent 12 }}
             {{- end }}

From 857aca3211784a730693f2b836b992dee8f0c1f1 Mon Sep 17 00:00:00 2001
From: 1602077 <1602077@users.noreply.github.com>
Date: Wed, 11 Feb 2026 06:29:53 +0100
Subject: [PATCH 2/3] feat(cinder-csi): allow cluster-id to be pulled from env
 variables

Signed-off-by: Jack Charlie Munday <1602077@users.noreply.github.com>
---
 .../templates/controllerplugin-deployment.yaml                  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/charts/cinder-csi-plugin/templates/controllerplugin-deployment.yaml b/charts/cinder-csi-plugin/templates/controllerplugin-deployment.yaml
index e04cd87432..6be37ce335 100644
--- a/charts/cinder-csi-plugin/templates/controllerplugin-deployment.yaml
+++ b/charts/cinder-csi-plugin/templates/controllerplugin-deployment.yaml
@@ -193,8 +193,10 @@ spec:
               value: unix://csi/csi.sock
             - name: CLOUD_CONFIG
               value: /etc/config/{{ .Values.secret.filename }}
+            {{- if .Values.clusterID }}
             - name: CLUSTER_NAME
               value: "{{ .Values.clusterID }}"
+            {{- end }}
             {{- if .Values.csi.plugin.extraEnv }}
               {{- toYaml .Values.csi.plugin.extraEnv | nindent 12 }}
             {{- end }}

From 6370ce280963df4689d9fbe3bf5f4e766ef7a24e Mon Sep 17 00:00:00 2001
From: 1602077 <1602077@users.noreply.github.com>
Date: Wed, 11 Feb 2026 06:30:13 +0100
Subject: [PATCH 3/3] chore: bump chart versions for manila & cinder

Signed-off-by: Jack Charlie Munday <1602077@users.noreply.github.com>
---
 charts/cinder-csi-plugin/Chart.yaml | 2 +-
 charts/manila-csi-plugin/Chart.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/cinder-csi-plugin/Chart.yaml b/charts/cinder-csi-plugin/Chart.yaml
index f419d9f749..26e9e1f009 100644
--- a/charts/cinder-csi-plugin/Chart.yaml
+++ b/charts/cinder-csi-plugin/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: v1.35.0
 description: Cinder CSI Chart for OpenStack
 name: openstack-cinder-csi
-version: 2.35.0
+version: 2.35.1
 home: https://github.com/kubernetes/cloud-provider-openstack
 icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
 maintainers:
diff --git a/charts/manila-csi-plugin/Chart.yaml b/charts/manila-csi-plugin/Chart.yaml
index a7370a8317..9657a99ded 100644
--- a/charts/manila-csi-plugin/Chart.yaml
+++ b/charts/manila-csi-plugin/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: v1.35.0
 description: Manila CSI Chart for OpenStack
 name: openstack-manila-csi
-version: 2.35.0
+version: 2.35.1
 home: http://github.com/kubernetes/cloud-provider-openstack
 icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
 maintainers: