Merge pull request #1424 from ExpediaInc/postinstalljob-imagename

fix(postinstall-job): Allow postinstall job to choose a docker repo/image

Author: k8s-ci-robot

charts/kubefed/README.md

@@ -131,6 +131,10 @@ chart and their default values.
 | controllermanager.certManager.rootCertificate.organizations       | Specifies the list of organizations to include in the cert-manager generated root certificate.                                                                  | []                              |
 | controllermanager.certManager.rootCertificate.commonName     | Specifies the CN value for the cert-manager generated root certificate.                                                                                              | ca.webhook.kubefed              |
 | controllermanager.certManager.rootCertificate.dnsNames       | Specifies the list of subject alternative names for the cert-manager generated root certificate.                                                                     | ["ca.webhook.kubefed"]          |
+| controllermanager.postInstallJob.repository        | Repo of the kubectl image for the post-install job                                                                                                                             | bitnami                         |
+| controllermanager.postInstallJob.image             | Name of the kubectl image for the post-install job                                                                                                                             | kubectl                         |
+| controllermanager.postInstallJob.tag               | Tag of the kubectl image for the post-install                                                                                                                                  | 1.17.16                         |
+| controllermanager.postInstallJob.imagePullPolicy   | Image pull policy of the kubectl post-install job                                                                                                                              | IfNotPresent                    |
 | global.scope                   | Whether the KubeFed namespace will be the only target for the control plane.                                                                                                                       | Cluster                         |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to

charts/kubefed/charts/controllermanager/templates/post-install-job.yaml

@@ -42,12 +42,21 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name | quote }}
         helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     spec:
+      {{- if .Values.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.imagePullSecrets | indent 8 }}
+      {{- end }}
+      nodeSelector:
+        {{- toYaml .Values.commonNodeSelector | nindent 8 }}
+      tolerations:
+        {{- toYaml .Values.commonTolerations | nindent 8 }}
       restartPolicy: Never
       serviceAccountName: kubefed-config-hook
       automountServiceAccountToken: true
       containers:
       - name: post-install-job
-        image: "bitnami/kubectl:1.17.16"
+        image: "{{ .Values.postInstallJob.repository }}/{{ .Values.postInstallJob.image }}:{{ .Values.postInstallJob.tag }}"
+        imagePullPolicy: "{{ .Values.postInstallJob.imagePullPolicy }}"
         command: ["/bin/bash"]
         args: ["/opt/scripts/setup.sh"]
         volumeMounts:

charts/kubefed/values.yaml

@@ -86,6 +86,12 @@ controllermanager:
         - ca.webhook.kubefed
       commonName: ca.webhook.kubefed
 
+  postInstallJob:
+    repository: bitnami
+    image: kubectl
+    tag: 1.17.16
+    imagePullPolicy: IfNotPresent
+
   service:
     labels: {}