Merge pull request #494 from andyzhangx/chart-serviceAccount-fix-v1.7

fix: node.serviceAccount setting in chart config on 1.7.0
kubernetes-csi · Jun 4, 2022 · 2457c6d · 2457c6d
2 parents ad56e3f + cc1bfb4
commit 2457c6d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/charts/v1.7.0/csi-driver-smb-v1.7.0.tgz b/charts/v1.7.0/csi-driver-smb-v1.7.0.tgz
diff --git a/charts/v1.7.0/csi-driver-smb/templates/csi-smb-node-windows.yaml b/charts/v1.7.0/csi-driver-smb/templates/csi-smb-node-windows.yaml
@@ -24,8 +24,15 @@ spec:
 {{- end }}
       nodeSelector:
         kubernetes.io/os: windows
+{{- with .Values.node.nodeSelector }}
+{{ toYaml . | indent 8 }}
+{{- end }}
+{{- with .Values.node.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+{{- end }}
       priorityClassName: system-node-critical
-      serviceAccountName: csi-smb-node-sa
+      serviceAccountName: {{ .Values.serviceAccount.node }}
       {{- include "smb.pullSecrets" . | indent 6 }}
       containers:
         - name: liveness-probe

diff --git a/charts/v1.7.0/csi-driver-smb/templates/csi-smb-node.yaml b/charts/v1.7.0/csi-driver-smb/templates/csi-smb-node.yaml
@@ -27,15 +27,16 @@ spec:
     spec:
       hostNetwork: true
       dnsPolicy: {{ .Values.linux.dnsPolicy }}
-      serviceAccountName: csi-smb-node-sa
+      serviceAccountName: {{ .Values.serviceAccount.node }}
       nodeSelector:
         kubernetes.io/os: linux
 {{- with .Values.node.nodeSelector }}
 {{ toYaml . | indent 8 }}
 {{- end }}
-        {{- if .Values.node.affinity }}
-{{- toYaml .Values.node.affinity | nindent 8 }}
-        {{- end }}
+{{- with .Values.node.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+{{- end }}
       priorityClassName: {{ .Values.priorityClassName | quote }}
 {{- with .Values.linux.tolerations }}
       tolerations: