Merge pull request #1079 from bitnami/tensorflow-inceptionGlobalImagePullSecrets

[bitnami/tensorflow-inception] Add global 'imagePullSecrets' to overwrite any other existing one

bitnami/tensorflow-inception/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: tensorflow-inception
-version: 3.2.9
+version: 3.3.0
 appVersion: 1.13.0
 description: Open-source software library for serving machine learning models
 keywords:

bitnami/tensorflow-inception/README.md

@@ -63,6 +63,7 @@ The following tables lists the configurable parameters of the TensorFlow Incepti
 | Parameter                       | Description                                      | Default                                                      |
 | ------------------------------- | ------------------------------------------------ | ------------------------------------------------------------ |
 | `global.imageRegistry`          | Global Docker image registry                     | `nil`                                                        |
+| `global.imagePullSecrets`       | Global Docker registry secret names as an array  | `[]` (does not add image pull secrets to deployed pods)      |
 | `replicaCount`                  | desired number of pods                           | `1`                                                          |
 | `server.image.registry`         | TensorFlow Serving image registry                | `docker.io`                                                  |
 | `server.image.repository`       | TensorFlow Serving Image name                    | `bitnami/tensorflow-serving`                                 |

bitnami/tensorflow-inception/templates/_helpers.tpl

@@ -70,3 +70,44 @@ Return the proper image name (for the metrics image)
 {{- $tag := .Values.metrics.image.tag | toString -}}
 {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
 {{- end -}}
+
+{{/*
+Return the proper Docker Image Registry Secret Names
+*/}}
+{{- define "tensorflow-inception.imagePullSecrets" -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic.
+Also, we can not use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+{{- if .Values.global.imagePullSecrets }}
+imagePullSecrets:
+{{- range .Values.global.imagePullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- else if or .Values.server.image.pullSecrets .Values.client.image.pullSecrets .Values.metrics.image.pullSecrets }}
+imagePullSecrets:
+{{- range .Values.server.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.client.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.metrics.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end -}}
+{{- else if or .Values.server.image.pullSecrets .Values.client.image.pullSecrets .Values.metrics.image.pullSecrets }}
+imagePullSecrets:
+{{- range .Values.server.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.client.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.metrics.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end -}}
+{{- end -}}

bitnami/tensorflow-inception/templates/deployment.yaml

@@ -34,12 +34,7 @@ spec:
         fsGroup: {{ .Values.securityContext.fsGroup }}
         runAsUser: {{ .Values.securityContext.runAsUser }}
       {{- end }}
-      {{- if .Values.server.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.server.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end}}
-      {{- end }}
+{{- include "tensorflow-inception.imagePullSecrets" . | indent 6 }}
       initContainers:
       - name: seed
         image: "{{ template "tensorflow-inception.client.image" . }}"

bitnami/tensorflow-inception/values.yaml

@@ -1,8 +1,11 @@
-## Global Docker image registry
-## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
+## Global Docker image parameters
+## Please, note that this will override the image parameters, including dependencies, configured to use the global value
+## Current available global Docker image parameters: imageRegistry and imagePullSecrets
 ##
 # global:
-#   imageRegistry:
+#   imageRegistry: myRegistryName
+#   imagePullSecrets:
+#     - myRegistryKeySecretName
 
 replicaCount: 1
 
@@ -24,7 +27,7 @@ server:
     ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
     ##
     # pullSecrets:
-    #   - myRegistrKeySecretName
+    #   - myRegistryKeySecretName
   port: 8500
 
 ## TensorFlow Inception image version
@@ -45,7 +48,7 @@ client:
     ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
     ##
     # pullSecrets:
-    #   - myRegistrKeySecretName
+    #   - myRegistryKeySecretName
 
 ## Specify a imagePullPolicy
 ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -85,7 +88,7 @@ metrics:
     ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
     ##
     # pullSecrets:
-    #   - myRegistrKeySecretName
+    #   - myRegistryKeySecretName
   ## Metrics exporter pod Annotation and Labels
   podAnnotations:
     prometheus.io/scrape: "true"