From dc12f41bc84f98152abe64dce639ec98d5bf609e Mon Sep 17 00:00:00 2001
From: andyzhangx <xiazhang@microsoft.com>
Date: Tue, 10 Dec 2024 09:35:04 +0000
Subject: [PATCH 1/3] fix: runOnControlPlane chart config

fix
---
 Makefile                                      |   2 +-
 charts/latest/csi-driver-smb-v0.0.0.tgz       | Bin 5084 -> 5180 bytes
 .../templates/csi-smb-controller.yaml         |  19 ++++++++++++------
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index ea086ce5d89..36da33ee4c3 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ BUILD_DATE := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 endif
 LDFLAGS = -X ${PKG}/pkg/smb.driverVersion=${IMAGE_VERSION} -X ${PKG}/pkg/smb.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/smb.buildDate=${BUILD_DATE}
 EXT_LDFLAGS = -s -w -extldflags "-static"
-E2E_HELM_OPTIONS ?= --set image.smb.repository=$(REGISTRY)/$(IMAGENAME) --set image.smb.tag=$(IMAGE_VERSION)
+E2E_HELM_OPTIONS ?= --set image.smb.repository=$(REGISTRY)/$(IMAGENAME) --set image.smb.tag=$(IMAGE_VERSION) --set controller.runOnControlPlane=true
 E2E_HELM_OPTIONS += ${EXTRA_HELM_OPTIONS}
 # Generate all combination of all OS, ARCH, and OSVERSIONS for iteration
 ALL_OS = linux windows
diff --git a/charts/latest/csi-driver-smb-v0.0.0.tgz b/charts/latest/csi-driver-smb-v0.0.0.tgz
index ccb42500c6195d2a756958448946392ae6f38df0..028adf6ea182b30b97609ccc4ff8e5a575865b10 100644
GIT binary patch
delta 5167
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

delta 5070
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

diff --git a/charts/latest/csi-driver-smb/templates/csi-smb-controller.yaml b/charts/latest/csi-driver-smb/templates/csi-smb-controller.yaml
index 4961f82f1d6..eb33cae9488 100755
--- a/charts/latest/csi-driver-smb/templates/csi-smb-controller.yaml
+++ b/charts/latest/csi-driver-smb/templates/csi-smb-controller.yaml
@@ -24,10 +24,20 @@ spec:
 {{ toYaml .Values.podAnnotations | indent 8 }}
 {{- end }}
     spec:
-{{- with .Values.controller.affinity }}
+    {{- if contains (tpl "{{ .Values.controller.affinity }}" .) "nodeSelectorTerms" }}
+      {{- with .Values.controller.affinity }}
       affinity:
-{{ toYaml . | indent 8 }}
-{{- end }}
+      {{ toYaml . | indent 8 }}
+      {{- end }}
+    {{- else if .Values.controller.runOnControlPlane}}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                - key: node-role.kubernetes.io/control-plane
+                  operator: Exists
+    {{- end }}
       hostNetwork: true
       dnsPolicy: {{ .Values.controller.dnsPolicy }}
       serviceAccountName: {{ .Values.serviceAccount.controller }}
@@ -39,9 +49,6 @@ spec:
         {{- if .Values.controller.runOnMaster}}
         node-role.kubernetes.io/master: ""
         {{- end}}
-        {{- if .Values.controller.runOnControlPlane}}
-        node-role.kubernetes.io/control-plane: ""
-        {{- end}}
       priorityClassName: {{ .Values.priorityClassName | quote }}
       {{- if .Values.securityContext }}
       securityContext: {{- toYaml .Values.securityContext | nindent 8 }}

From 5a9dda426b265619006f87f7721223a225f58de3 Mon Sep 17 00:00:00 2001
From: andyzhangx <xiazhang@microsoft.com>
Date: Tue, 10 Dec 2024 13:50:44 +0000
Subject: [PATCH 2/3] fix: runOnControlPlane chart config in v1.16.0

---
 charts/README.md                              |   3 +--
 charts/v1.16.0/csi-driver-smb-v1.16.0.tgz     | Bin 4957 -> 5055 bytes
 .../templates/csi-smb-controller.yaml         |  19 ++++++++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/charts/README.md b/charts/README.md
index af775ef6ecb..c2eeb04ad38 100644
--- a/charts/README.md
+++ b/charts/README.md
@@ -8,8 +8,7 @@
 
 - run smb-controller on control plane node: `--set controller.runOnControlPlane=true`
 - Microk8s based kubernetes recommended settings:
-    - `--set linux.kubelet="/var/snap/microk8s/common/var/lib/kubelet"` - sets correct path to microk8s kubelet even
-      though a user has a folder link to it.
+    - `--set linux.kubelet="/var/snap/microk8s/common/var/lib/kubelet"` - sets correct path to microk8s kubelet even though a user has a folder link to it.
 
 ### install a specific version
 
diff --git a/charts/v1.16.0/csi-driver-smb-v1.16.0.tgz b/charts/v1.16.0/csi-driver-smb-v1.16.0.tgz
index ad4f9d9f9db752ef321a0b14a5aafe3ee5d7b415..e9914c4b8ef3559ed3433c9e53c5f1b6fd6fa721 100644
GIT binary patch
delta 5042
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
IxB!p<0J%RHs{jB1

delta 4943
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
N|Nl<2q+kG$004+Dy`umC

diff --git a/charts/v1.16.0/csi-driver-smb/templates/csi-smb-controller.yaml b/charts/v1.16.0/csi-driver-smb/templates/csi-smb-controller.yaml
index b800df63698..99bd18b6316 100644
--- a/charts/v1.16.0/csi-driver-smb/templates/csi-smb-controller.yaml
+++ b/charts/v1.16.0/csi-driver-smb/templates/csi-smb-controller.yaml
@@ -24,10 +24,20 @@ spec:
 {{ toYaml .Values.podAnnotations | indent 8 }}
 {{- end }}
     spec:
-{{- with .Values.controller.affinity }}
+    {{- if contains (tpl "{{ .Values.controller.affinity }}" .) "nodeSelectorTerms" }}
+      {{- with .Values.controller.affinity }}
       affinity:
-{{ toYaml . | indent 8 }}
-{{- end }}
+      {{ toYaml . | indent 8 }}
+      {{- end }}
+    {{- else if .Values.controller.runOnControlPlane}}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                - key: node-role.kubernetes.io/control-plane
+                  operator: Exists
+    {{- end }}
       hostNetwork: true
       dnsPolicy: {{ .Values.controller.dnsPolicy }}
       serviceAccountName: {{ .Values.serviceAccount.controller }}
@@ -39,9 +49,6 @@ spec:
         {{- if .Values.controller.runOnMaster}}
         node-role.kubernetes.io/master: ""
         {{- end}}
-        {{- if .Values.controller.runOnControlPlane}}
-        node-role.kubernetes.io/control-plane: ""
-        {{- end}}
       priorityClassName: {{ .Values.priorityClassName | quote }}
       {{- if .Values.securityContext }}
       securityContext: {{- toYaml .Values.securityContext | nindent 8 }}

From 975289f22501686fa7c2f44fd80078ab7e9a8302 Mon Sep 17 00:00:00 2001
From: andyzhangx <xiazhang@microsoft.com>
Date: Tue, 10 Dec 2024 13:52:05 +0000
Subject: [PATCH 3/3] doc: add allowVolumeExpansion in examples

---
 deploy/example/e2e_usage.md               | 2 ++
 deploy/example/storageclass-smb-krb5.yaml | 1 +
 deploy/example/storageclass-smb.yaml      | 1 +
 deploy/example/windows/README.md          | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/deploy/example/e2e_usage.md b/deploy/example/e2e_usage.md
index 26e684541fe..085445bb180 100644
--- a/deploy/example/e2e_usage.md
+++ b/deploy/example/e2e_usage.md
@@ -29,6 +29,7 @@ parameters:
   csi.storage.k8s.io/node-stage-secret-namespace: default
 reclaimPolicy: Delete  # available values: Delete, Retain
 volumeBindingMode: Immediate
+allowVolumeExpansion: true
 mountOptions:
   - dir_mode=0777
   - file_mode=0777
@@ -59,6 +60,7 @@ parameters:
   csi.storage.k8s.io/node-stage-secret-name: smbcreds
   csi.storage.k8s.io/node-stage-secret-namespace: default
 volumeBindingMode: Immediate
+allowVolumeExpansion: true
 mountOptions:
   - dir_mode=0777
   - file_mode=0777
diff --git a/deploy/example/storageclass-smb-krb5.yaml b/deploy/example/storageclass-smb-krb5.yaml
index 9bb9a12758b..59b5d61f4ff 100644
--- a/deploy/example/storageclass-smb-krb5.yaml
+++ b/deploy/example/storageclass-smb-krb5.yaml
@@ -14,6 +14,7 @@ parameters:
   csi.storage.k8s.io/node-stage-secret-name: smbcreds-krb5
   csi.storage.k8s.io/node-stage-secret-namespace: default
 volumeBindingMode: Immediate
+allowVolumeExpansion: true
 mountOptions:
   - sec=krb5
   - cruid=1000
diff --git a/deploy/example/storageclass-smb.yaml b/deploy/example/storageclass-smb.yaml
index f87e220a2c7..2c3a04d3b9f 100644
--- a/deploy/example/storageclass-smb.yaml
+++ b/deploy/example/storageclass-smb.yaml
@@ -14,6 +14,7 @@ parameters:
   csi.storage.k8s.io/node-stage-secret-name: smbcreds
   csi.storage.k8s.io/node-stage-secret-namespace: default
 volumeBindingMode: Immediate
+allowVolumeExpansion: true
 mountOptions:
   - dir_mode=0777
   - file_mode=0777
diff --git a/deploy/example/windows/README.md b/deploy/example/windows/README.md
index 8584309eb47..96b2067faab 100644
--- a/deploy/example/windows/README.md
+++ b/deploy/example/windows/README.md
@@ -39,6 +39,7 @@ kind: StorageClass
 metadata:
   name: smb
 provisioner: smb.csi.k8s.io
+allowVolumeExpansion: true
 parameters:
   source: //smb-server.default.svc.cluster.local/share
 ...
@@ -81,6 +82,7 @@ kind: StorageClass
 metadata:
   name: smb
 provisioner: smb.csi.k8s.io
+allowVolumeExpansion: true
 parameters:
   source: //10.111.254.254/share
 ...