fix(CSI-243): service accounts for CSI plugin assume ImagePullSecret …

…and cause error messages.
weka · Sep 11, 2024 · 2fb98d4 · 2fb98d4
1 parent a718c35
commit 2fb98d4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/charts/csi-wekafsplugin/templates/controllerserver-serviceaccount.yaml b/charts/csi-wekafsplugin/templates/controllerserver-serviceaccount.yaml
@@ -1,7 +1,9 @@
 apiVersion: v1
 kind: ServiceAccount
+{{- if .Values.imagePullSecret}}
 imagePullSecrets:
-  - name: {{ .Release.Name }}-creds
+  - name: {{ .Values.imagePullSecret }}
+{{- end }}
 metadata:
   name: {{ .Release.Name }}-controller
   namespace: {{ .Release.Namespace }}

diff --git a/charts/csi-wekafsplugin/templates/nodeserver-serviceaccount.yaml b/charts/csi-wekafsplugin/templates/nodeserver-serviceaccount.yaml
@@ -1,7 +1,9 @@
 apiVersion: v1
 kind: ServiceAccount
+{{- if .Values.imagePullSecret}}
 imagePullSecrets:
-  - name: {{ .Release.Name }}-creds
+  - name: {{ .Values.imagePullSecret }}
+{{- end }}
 metadata:
   name: {{ .Release.Name }}-node
   namespace: {{ .Release.Namespace }}

diff --git a/charts/csi-wekafsplugin/values.yaml b/charts/csi-wekafsplugin/values.yaml
@@ -25,6 +25,10 @@ images:
   csidriver: quay.io/weka.io/csi-wekafs
   # -- CSI driver tag
   csidriverTag: *csiDriverVersion
+# -- image pull secret required for image download. Must have permissions to access all images above.
+#    Should be used in case of private registry that requires authentication
+imagePullSecret: ""
+
 # -- Tolerations for all CSI driver components
 globalPluginTolerations: &globalPluginTolerations
   - key: node-role.kubernetes.io/master