feat: add support for defining preexisting sa

kubernetes-sigs · Jun 10, 2021 · 765ca8a · 765ca8a
1 parent e61720b
commit 765ca8a
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 18 deletions.
diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -19,7 +19,7 @@ spec:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
       {{- end }}
       hostNetwork: true
-      serviceAccountName: csi-azuredisk-controller-sa
+      serviceAccountName: {{ .Values.serviceAccount.controller.name }}
       nodeSelector:
         kubernetes.io/os: linux
         {{- if .Values.controller.runOnMaster}}

diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
@@ -14,7 +14,7 @@ spec:
 {{ include "azuredisk.labels" . | indent 6 }}
         app: csi-azuredisk-node-win
     spec:
-      serviceAccountName: csi-azuredisk-node-sa
+      serviceAccountName: {{ .Values.serviceAccount.node.name }}
       tolerations:
         - key: "node.kubernetes.io/os"
           operator: "Exists"

diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -20,7 +20,7 @@ spec:
       {{- end }}
       hostNetwork: true
       dnsPolicy: ClusterFirstWithHostNet
-      serviceAccountName: csi-azuredisk-node-sa
+      serviceAccountName: {{ .Values.serviceAccount.node.name }}
       nodeSelector:
         kubernetes.io/os: linux
       affinity:

diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-snapshot-controller.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-snapshot-controller.yaml
@@ -15,7 +15,7 @@ spec:
 {{ include "azuredisk.labels" . | indent 6 }}
         app: csi-snapshot-controller
     spec:
-      serviceAccountName: csi-snapshot-controller-sa
+      serviceAccountName: {{ .Values.serviceAccount.snapshotcontroller.name }}
       nodeSelector:
         kubernetes.io/os: linux
       priorityClassName: system-cluster-critical

diff --git a/charts/latest/azuredisk-csi-driver/templates/rbac-csi-azuredisk-controller.yaml b/charts/latest/azuredisk-csi-driver/templates/rbac-csi-azuredisk-controller.yaml
@@ -42,7 +42,7 @@ metadata:
 {{ include "azuredisk.labels" . | indent 2 }}
 subjects:
   - kind: ServiceAccount
-    name: csi-azuredisk-controller-sa
+    name: {{ .Values.serviceAccount.controller.name }}
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
@@ -84,7 +84,7 @@ metadata:
 {{ include "azuredisk.labels" . | indent 2 }}
 subjects:
   - kind: ServiceAccount
-    name: csi-azuredisk-controller-sa
+    name: {{ .Values.serviceAccount.controller.name }}
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
@@ -129,7 +129,7 @@ metadata:
 {{ include "azuredisk.labels" . | indent 2 }}
 subjects:
   - kind: ServiceAccount
-    name: csi-azuredisk-controller-sa
+    name: {{ .Values.serviceAccount.controller.name }}
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
@@ -169,7 +169,7 @@ metadata:
 {{ include "azuredisk.labels" . | indent 2 }}
 subjects:
   - kind: ServiceAccount
-    name: csi-azuredisk-controller-sa
+    name: {{ .Values.serviceAccount.controller.name }}
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
@@ -193,7 +193,7 @@ metadata:
   name: csi-azuredisk-controller-secret-binding
 subjects:
   - kind: ServiceAccount
-    name: csi-azuredisk-controller-sa
+    name: {{ .Values.serviceAccount.controller.name }}
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole

diff --git a/charts/latest/azuredisk-csi-driver/templates/rbac-csi-azuredisk-node.yaml b/charts/latest/azuredisk-csi-driver/templates/rbac-csi-azuredisk-node.yaml
@@ -16,7 +16,7 @@ metadata:
   name: csi-azuredisk-node-secret-binding
 subjects:
   - kind: ServiceAccount
-    name: csi-azuredisk-node-sa
+    name: {{ .Values.serviceAccount.node.name }}
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole

diff --git a/charts/latest/azuredisk-csi-driver/templates/rbac-csi-snapshot-controller.yaml b/charts/latest/azuredisk-csi-driver/templates/rbac-csi-snapshot-controller.yaml
@@ -36,7 +36,7 @@ metadata:
   name: csi-snapshot-controller-binding
 subjects:
   - kind: ServiceAccount
-    name: csi-snapshot-controller-sa
+    name: {{ .Values.serviceAccount.snapshotcontroller.name }}
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
@@ -60,7 +60,7 @@ metadata:
   name: csi-snapshot-controller-leaderelection-binding
 subjects:
   - kind: ServiceAccount
-    name: csi-snapshot-controller-sa
+    name: {{ .Values.serviceAccount.snapshotcontroller.name }}
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole

diff --git a/charts/latest/azuredisk-csi-driver/templates/serviceaccount-csi-azuredisk-controller.yaml b/charts/latest/azuredisk-csi-driver/templates/serviceaccount-csi-azuredisk-controller.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: csi-azuredisk-controller-sa
+  name: {{ .Values.serviceAccount.controller.name }}
   namespace: {{ .Release.Namespace }}
 {{ include "azuredisk.labels" . | indent 2 }}
 {{- end -}}
diff --git a/charts/latest/azuredisk-csi-driver/templates/serviceaccount-csi-azuredisk-node.yaml b/charts/latest/azuredisk-csi-driver/templates/serviceaccount-csi-azuredisk-node.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: csi-azuredisk-node-sa
+  name: {{ .Values.serviceAccount.node.name }}
   namespace: {{ .Release.Namespace }}
 {{ include "azuredisk.labels" . | indent 2 }}
 {{- end -}}
diff --git a/charts/latest/azuredisk-csi-driver/templates/serviceaccount-csi-snapshot-controller.yaml b/charts/latest/azuredisk-csi-driver/templates/serviceaccount-csi-snapshot-controller.yaml
@@ -2,6 +2,6 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: csi-snapshot-controller-sa
+  name: {{ .Values.serviceAccount.snapshotcontroller.name }}
   namespace: {{ .Release.Namespace }}
 {{- end -}}
diff --git a/charts/latest/azuredisk-csi-driver/values.yaml b/charts/latest/azuredisk-csi-driver/values.yaml
@@ -25,11 +25,17 @@ image:
     pullPolicy: IfNotPresent
 
 serviceAccount:
-  create: true
+  create: true # When true, a service account will be created for you. Set to false if you want to use your own.
+  controller:
+    name: csi-azuredisk-controller-sa # Name of Service Account to be created or used
+  node:
+    name: csi-azuredisk-node-sa # Name of Service Account to be created or used
+  snapshotcontroller:
+    name: csi-snapshot-controller-sa # Name of Service Account to be created or used
 
 rbac:
   create: true
-
+  
 controller:
   replicas: 2
   metricsPort: 29604
@@ -59,7 +65,7 @@ snapshot:
       pullPolicy: IfNotPresent
   snapshotController:
     replicas: 1
-    serviceAccount: true
+    serviceAccount: true # When true, a service account will be created for you. Set to false if you want to use your own.
     rbac: true
 
 feature: