diff --git a/charts/latest/csi-driver-nfs-v4.1.0.tgz b/charts/latest/csi-driver-nfs-v4.1.0.tgz index 24d990fb..e50c9616 100644 Binary files a/charts/latest/csi-driver-nfs-v4.1.0.tgz and b/charts/latest/csi-driver-nfs-v4.1.0.tgz differ diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml index 644a2701..3a637566 100644 --- a/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml +++ b/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml @@ -24,6 +24,7 @@ spec: {{- end }} hostNetwork: true # original nfs connection would be broken without hostNetwork setting dnsPolicy: {{ .Values.controller.dnsPolicy }} + serviceAccountName: csi-nfs-node-sa nodeSelector: kubernetes.io/os: linux {{- with .Values.node.tolerations }} diff --git a/charts/latest/csi-driver-nfs/templates/rbac-csi-nfs-controller.yaml b/charts/latest/csi-driver-nfs/templates/rbac-csi-nfs.yaml similarity index 90% rename from charts/latest/csi-driver-nfs/templates/rbac-csi-nfs-controller.yaml rename to charts/latest/csi-driver-nfs/templates/rbac-csi-nfs.yaml index 73e4ae07..8478af73 100644 --- a/charts/latest/csi-driver-nfs/templates/rbac-csi-nfs-controller.yaml +++ b/charts/latest/csi-driver-nfs/templates/rbac-csi-nfs.yaml @@ -7,6 +7,13 @@ metadata: namespace: {{ .Release.Namespace }} {{ include "nfs.labels" . | indent 2 }} --- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: csi-{{ .Values.rbac.name }}-node-sa + namespace: {{ .Release.Namespace }} +{{ include "nfs.labels" . | indent 2 }} +--- {{- end -}} {{- if .Values.rbac.create -}} diff --git a/deploy/csi-nfs-node.yaml b/deploy/csi-nfs-node.yaml index 214253ab..fb4687c0 100644 --- a/deploy/csi-nfs-node.yaml +++ b/deploy/csi-nfs-node.yaml @@ -19,6 +19,7 @@ spec: spec: hostNetwork: true # original nfs connection would be broken without hostNetwork setting dnsPolicy: Default # available values: Default, ClusterFirstWithHostNet, ClusterFirst + serviceAccountName: csi-nfs-node-sa nodeSelector: kubernetes.io/os: linux tolerations: diff --git a/deploy/install-driver.sh b/deploy/install-driver.sh index 6e0a3ab4..2c4006bc 100755 --- a/deploy/install-driver.sh +++ b/deploy/install-driver.sh @@ -34,7 +34,7 @@ if [ $ver != "master" ]; then fi echo "Installing NFS CSI driver, version: $ver ..." -kubectl apply -f $repo/rbac-csi-nfs-controller.yaml +kubectl apply -f $repo/rbac-csi-nfs.yaml kubectl apply -f $repo/csi-nfs-driverinfo.yaml kubectl apply -f $repo/csi-nfs-controller.yaml kubectl apply -f $repo/csi-nfs-node.yaml diff --git a/deploy/rbac-csi-nfs-controller.yaml b/deploy/rbac-csi-nfs.yaml similarity index 93% rename from deploy/rbac-csi-nfs-controller.yaml rename to deploy/rbac-csi-nfs.yaml index 2ac4a680..45c80e93 100644 --- a/deploy/rbac-csi-nfs-controller.yaml +++ b/deploy/rbac-csi-nfs.yaml @@ -4,7 +4,12 @@ kind: ServiceAccount metadata: name: csi-nfs-controller-sa namespace: kube-system - +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: csi-nfs-node-sa + namespace: kube-system --- kind: ClusterRole diff --git a/deploy/uninstall-driver.sh b/deploy/uninstall-driver.sh index 0785e132..d563fc98 100755 --- a/deploy/uninstall-driver.sh +++ b/deploy/uninstall-driver.sh @@ -37,5 +37,5 @@ echo "Uninstalling NFS driver, version: $ver ..." kubectl delete -f $repo/csi-nfs-controller.yaml --ignore-not-found kubectl delete -f $repo/csi-nfs-node.yaml --ignore-not-found kubectl delete -f $repo/csi-nfs-driverinfo.yaml --ignore-not-found -kubectl delete -f $repo/rbac-csi-nfs-controller.yaml --ignore-not-found +kubectl delete -f $repo/rbac-csi-nfs.yaml --ignore-not-found echo 'Uninstalled NFS driver successfully.'