Add ImagePullSecrets to Helm chart

Title is self-explanatory pr-link: #14289 change-id: cid-26cd26257e3d4565586ab8d1b80ef69faf91fe43
Alluxio · Oct 22, 2021 · c775c70 · c775c70
1 parent bda055b
commit c775c70
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 1 deletion.
diff --git a/integration/kubernetes/helm-chart/alluxio/CHANGELOG.md b/integration/kubernetes/helm-chart/alluxio/CHANGELOG.md
@@ -211,3 +211,7 @@
 0.6.29
 
 - Add startupProbe and checking for web port when using HA without embedded journal
+
+0.6.30
+
+- Add ImagePullSecrets Pod spec option
diff --git a/integration/kubernetes/helm-chart/alluxio/Chart.yaml b/integration/kubernetes/helm-chart/alluxio/Chart.yaml
@@ -12,7 +12,7 @@
 name: alluxio
 apiVersion: v1
 description: Open source data orchestration for analytics and machine learning in any cloud.
-version: 0.6.29
+version: 0.6.30
 home: https://www.alluxio.io/
 maintainers:
 - name: Adit Madan

diff --git a/integration/kubernetes/helm-chart/alluxio/templates/_helpers.tpl b/integration/kubernetes/helm-chart/alluxio/templates/_helpers.tpl
@@ -329,3 +329,9 @@ hostAliases:
 {{- end }}
 {{- end -}}
 
+{{- define "alluxio.imagePullSecrets" -}}
+imagePullSecrets:
+{{- range $name := .Values.imagePullSecrets }}
+  - name: {{ $name }}
+{{- end -}}
+{{- end -}}
diff --git a/integration/kubernetes/helm-chart/alluxio/templates/csi/controller.yaml b/integration/kubernetes/helm-chart/alluxio/templates/csi/controller.yaml
@@ -46,6 +46,9 @@ spec:
       hostNetwork: {{ .Values.csi.controllerPlugin.hostNetwork }}
       dnsPolicy: {{ .Values.csi.controllerPlugin.dnsPolicy }}
       serviceAccountName: csi-controller-sa
+      {{- if .Values.imagePullSecrets }}
+{{ include "alluxio.imagePullSecrets" . | indent 6 }}
+      {{- end}}
       containers:
         - name: csi-provisioner
           image: {{ .Values.csi.controllerPlugin.provisioner.image }}

diff --git a/integration/kubernetes/helm-chart/alluxio/templates/csi/nginx-pod.yaml b/integration/kubernetes/helm-chart/alluxio/templates/csi/nginx-pod.yaml
@@ -15,6 +15,9 @@ kind: Pod
 metadata:
   name: nginx
 spec:
+  {{- if .Values.imagePullSecrets }}
+{{ include "alluxio.imagePullSecrets" . | indent 2 }}
+  {{- end}}
   containers:
   - image: nginx
     imagePullPolicy: Always

diff --git a/integration/kubernetes/helm-chart/alluxio/templates/csi/nodeplugin.yaml b/integration/kubernetes/helm-chart/alluxio/templates/csi/nodeplugin.yaml
@@ -43,6 +43,9 @@ spec:
     spec:
       hostNetwork: {{ .Values.csi.nodePlugin.hostNetwork }}
       dnsPolicy: {{ .Values.csi.nodePlugin.dnsPolicy }}
+      {{- if .Values.imagePullSecrets }}
+{{ include "alluxio.imagePullSecrets" . | indent 6 }}
+      {{- end}}
       containers:
         - name: node-driver-registrar
           image: {{ .Values.csi.nodePlugin.driverRegistrar.image }}

diff --git a/integration/kubernetes/helm-chart/alluxio/templates/fuse/client-daemonset.yaml b/integration/kubernetes/helm-chart/alluxio/templates/fuse/client-daemonset.yaml
@@ -46,6 +46,9 @@ spec:
       {{- end }}
     {{- end }}
     spec:
+      {{- if .Values.imagePullSecrets }}
+{{ include "alluxio.imagePullSecrets" . | indent 6 }}
+      {{- end}}
       containers:
         - name: alluxio-fuse-client
           image: alpine:latest

diff --git a/integration/kubernetes/helm-chart/alluxio/templates/fuse/daemonset.yaml b/integration/kubernetes/helm-chart/alluxio/templates/fuse/daemonset.yaml
@@ -79,6 +79,9 @@ spec:
                 values:
                 - alluxio-worker
             topologyKey: kubernetes.io/hostname
+      {{- if .Values.imagePullSecrets }}
+{{ include "alluxio.imagePullSecrets" . | indent 6 }}
+      {{- end}}
       containers:
         - name: alluxio-fuse
           image: {{ .Values.image }}:{{ .Values.imageTag }}

diff --git a/integration/kubernetes/helm-chart/alluxio/templates/logserver/deployment.yaml b/integration/kubernetes/helm-chart/alluxio/templates/logserver/deployment.yaml
@@ -52,6 +52,9 @@ spec:
       {{- if .Values.tolerations }}
 {{ toYaml .Values.tolerations | trim | indent 8  }}
       {{- end }}
+      {{- if .Values.imagePullSecrets }}
+{{ include "alluxio.imagePullSecrets" . | indent 6 }}
+      {{- end}}
       containers:
         - name: alluxio-logserver
           image: {{ .Values.image }}:{{ .Values.imageTag }}

diff --git a/integration/kubernetes/helm-chart/alluxio/templates/master/statefulset.yaml b/integration/kubernetes/helm-chart/alluxio/templates/master/statefulset.yaml
@@ -87,6 +87,9 @@ spec:
     {{- else if .Values.serviceAccount }}
       serviceAccountName: {{ .Values.serviceAccount }}
     {{- end }}
+      {{- if .Values.imagePullSecrets }}
+{{ include "alluxio.imagePullSecrets" . | indent 6 }}
+      {{- end}}
       initContainers:
       {{- if .Values.journal.format.runFormat}}
       - name: journal-format

diff --git a/integration/kubernetes/helm-chart/alluxio/templates/worker/daemonset.yaml b/integration/kubernetes/helm-chart/alluxio/templates/worker/daemonset.yaml
@@ -82,6 +82,9 @@ spec:
     {{- else if .Values.serviceAccount }}
       serviceAccountName: {{ .Values.serviceAccount }}
     {{- end }}
+      {{- if .Values.imagePullSecrets }}
+{{ include "alluxio.imagePullSecrets" . | indent 6 }}
+      {{- end}}
       containers:
         - name: alluxio-worker
           image: {{ .Values.image }}:{{ .Values.imageTag }}

diff --git a/integration/kubernetes/helm-chart/alluxio/values.yaml b/integration/kubernetes/helm-chart/alluxio/values.yaml
@@ -30,6 +30,16 @@ fsGroup: 1000
 #   ServiceAccount used for the namespace
 serviceAccount:
 
+# Image Pull Secret
+#   The secrets will need to be created externally from
+#   this Helm chart, but you can configure the Alluxio
+#   Pods to use the following list of secrets
+# eg:
+# imagePullSecrets:
+#   - ecr
+#   - dev
+imagePullSecrets:
+
 # Site properties for all the components
 properties:
   # alluxio.user.metrics.collection.enabled: 'true'