Merge pull request #480 from andyzhangx/node-serviceAccount

fix: add serviceAccount for driver daemonset running on the node
kubernetes-csi · May 15, 2022 · 4e99bc9 · 4e99bc9
2 parents b8e368b + 016ebce
commit 4e99bc9
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 5 deletions.
diff --git a/charts/latest/csi-driver-smb-v1.7.0.tgz b/charts/latest/csi-driver-smb-v1.7.0.tgz
diff --git a/charts/latest/csi-driver-smb/templates/csi-smb-node-windows.yaml b/charts/latest/csi-driver-smb/templates/csi-smb-node-windows.yaml
@@ -25,6 +25,7 @@ spec:
       nodeSelector:
         kubernetes.io/os: windows
       priorityClassName: system-node-critical
+      serviceAccountName: csi-smb-node-sa
       {{- include "smb.pullSecrets" . | indent 6 }}
       containers:
         - name: liveness-probe

diff --git a/charts/latest/csi-driver-smb/templates/csi-smb-node.yaml b/charts/latest/csi-driver-smb/templates/csi-smb-node.yaml
@@ -27,6 +27,7 @@ spec:
     spec:
       hostNetwork: true
       dnsPolicy: {{ .Values.linux.dnsPolicy }}
+      serviceAccountName: csi-smb-node-sa
       nodeSelector:
         kubernetes.io/os: linux
 {{- with .Values.node.nodeSelector }}

diff --git a/...mb/templates/rbac-csi-smb-controller.yaml → ...si-driver-smb/templates/rbac-csi-smb.yaml b/...mb/templates/rbac-csi-smb-controller.yaml → ...si-driver-smb/templates/rbac-csi-smb.yaml
@@ -6,6 +6,13 @@ metadata:
   name: {{ .Values.serviceAccount.controller }}
   namespace: {{ .Release.Namespace }}
 {{ include "smb.labels" . | indent 2 }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Values.serviceAccount.node }}
+  namespace: {{ .Release.Namespace }}
+{{ include "smb.labels" . | indent 2 }}
 {{ end }}
 
 {{- if .Values.rbac.create -}}

diff --git a/charts/latest/csi-driver-smb/values.yaml b/charts/latest/csi-driver-smb/values.yaml
@@ -19,7 +19,8 @@ image:
 
 serviceAccount:
   create: true # When true, service accounts will be created for you. Set to false if you want to use your own.
-  controller: csi-smb-controller-sa # Name of Service Account to be created or used
+  controller: csi-smb-controller-sa
+  node: csi-smb-node-sa
 
 rbac:
   create: true

diff --git a/deploy/csi-smb-node-windows.yaml b/deploy/csi-smb-node-windows.yaml
@@ -24,6 +24,7 @@ spec:
       nodeSelector:
         kubernetes.io/os: windows
       priorityClassName: system-node-critical
+      serviceAccountName: csi-smb-node-sa
       containers:
         - name: liveness-probe
           volumeMounts:

diff --git a/deploy/csi-smb-node.yaml b/deploy/csi-smb-node.yaml
@@ -19,6 +19,7 @@ spec:
     spec:
       hostNetwork: true
       dnsPolicy: Default  # available values: Default, ClusterFirstWithHostNet, ClusterFirst
+      serviceAccountName: csi-smb-node-sa
       nodeSelector:
         kubernetes.io/os: linux
       priorityClassName: system-node-critical

diff --git a/deploy/install-driver.sh b/deploy/install-driver.sh
@@ -34,7 +34,7 @@ if [ $ver != "master" ]; then
 fi
 
 echo "Installing SMB CSI driver, version: $ver ..."
-kubectl apply -f $repo/rbac-csi-smb-controller.yaml
+kubectl apply -f $repo/rbac-csi-smb.yaml
 kubectl apply -f $repo/csi-smb-driver.yaml
 kubectl apply -f $repo/csi-smb-controller.yaml
 kubectl apply -f $repo/csi-smb-node.yaml

diff --git a/deploy/rbac-csi-smb-controller.yaml → deploy/rbac-csi-smb.yaml b/deploy/rbac-csi-smb-controller.yaml → deploy/rbac-csi-smb.yaml
@@ -4,9 +4,13 @@ kind: ServiceAccount
 metadata:
   name: csi-smb-controller-sa
   namespace: kube-system
-
 ---
-
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: csi-smb-node-sa
+  namespace: kube-system
+---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:

diff --git a/deploy/uninstall-driver.sh b/deploy/uninstall-driver.sh
@@ -38,5 +38,5 @@ kubectl delete -f $repo/csi-smb-controller.yaml --ignore-not-found
 kubectl delete -f $repo/csi-smb-node.yaml --ignore-not-found
 kubectl delete -f $repo/csi-smb-node-windows.yaml --ignore-not-found
 kubectl delete -f $repo/csi-smb-driver.yaml --ignore-not-found
-kubectl delete -f $repo/rbac-csi-smb-controller.yaml --ignore-not-found
+kubectl delete -f $repo/rbac-csi-smb.yaml --ignore-not-found
 echo 'Uninstalled SMB CSI driver successfully.'