docker login on invoker pods when using private registry

apache · Oct 21, 2020 · 2396fc8 · 2396fc8
1 parent f58729b
commit 2396fc8
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/helm/openwhisk/configMapFiles/dockerLogin/dockerLogin.sh b/helm/openwhisk/configMapFiles/dockerLogin/dockerLogin.sh
@@ -0,0 +1 @@
+docker login $RUNTIMES_REGISTRY -u $RUNTIMES_REGISTRY_USERNAME -p $RUNTIMES_REGISTRY_PASSWORD
diff --git a/helm/openwhisk/templates/_helpers.tpl b/helm/openwhisk/templates/_helpers.tpl
@@ -310,6 +310,11 @@ imagePullSecrets:
  mountPath: "/invoker-scripts/configureDNS.sh"
  subPath: "configureDNS.sh"
 {{- end }}
+{{- if ne .Values.docker.registry.name "" }}
+ - name: scripts-dir
+ mountPath: "/invoker-scripts/dockerLogin.sh"
+ subPath: "dockerLogin.sh"
+{{- end }}
 {{- end }}
 {{- end }}
 

diff --git a/helm/openwhisk/templates/invoker-cm.yaml b/helm/openwhisk/templates/invoker-cm.yaml
@@ -24,3 +24,4 @@ metadata:
 data:
 {{ (.Files.Glob "configMapFiles/dockerPullRuntimes/playbook.yml").AsConfig | indent 2 }}
 {{ (.Files.Glob "configMapFiles/configureDNS/configureDNS.sh").AsConfig | indent 2 }}
+{{ (.Files.Glob "configMapFiles/dockerLogin/dockerLogin.sh").AsConfig | indent 2 }}
diff --git a/helm/openwhisk/templates/invoker-pod.yaml b/helm/openwhisk/templates/invoker-pod.yaml
@@ -83,11 +83,17 @@ spec:
  - name: invoker
  image: "{{- .Values.docker.registry.name -}}{{- .Values.invoker.imageName -}}:{{- .Values.invoker.imageTag -}}"
  imagePullPolicy: {{ .Values.invoker.imagePullPolicy | quote }}
+ command:
+ - /bin/bash
+ - -c
+ -
+{{- if ne .Values.docker.registry.name "" }}
+ . /invoker-scripts/dockerLogin.sh &&
+{{- end }}
 {{- if and (eq .Values.invoker.containerFactory.impl "docker") .Values.invoker.containerFactory.networkConfig.dns.inheritInvokerConfig }}
- command: [ "/bin/bash", "-c", ". /invoker-scripts/configureDNS.sh && /init.sh --uniqueName $INVOKER_NAME" ]
-{{- else }}
- command: [ "/bin/bash", "-c", "/init.sh --uniqueName $INVOKER_NAME" ]
+ . /invoker-scripts/configureDNS.sh &&
 {{- end }}
+ /init.sh --uniqueName $INVOKER_NAME
  env:
  - name: "PORT"
  value: {{ .Values.invoker.port | quote }}
@@ -207,6 +213,20 @@ spec:
 {{- end }}
  - name: "CONFIG_whisk_helm_release"
  value: "{{ .Release.Name }}"
+{{- if ne .Values.docker.registry.name "" }}
+ - name: "RUNTIMES_REGISTRY"
+ value: "{{- .Values.docker.registry.name -}}"
+ - name: "RUNTIMES_REGISTRY_USERNAME"
+ valueFrom:
+ secretKeyRef:
+ name: {{ .Release.Name }}-docker.registry.auth
+ key: docker_registry_username
+ - name: "RUNTIMES_REGISTRY_PASSWORD"
+ valueFrom:
+ secretKeyRef:
+ name: {{ .Release.Name }}-docker.registry.auth
+ key: docker_registry_password
+{{- end }}
  ports:
  - name: invoker
  containerPort: {{ .Values.invoker.port }}