Merge pull request #1091 from bitnami/elasticsearchGlobalImagePullSecrets

[bitnami/elasticsearch] Add global 'imagePullSecrets' to overwrite any other existing one

bitnami/elasticsearch/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: elasticsearch
-version: 4.3.0
+version: 4.4.0
 appVersion: 6.6.1
 description: A highly scalable open-source full-text search and analytics engine
 keywords:

bitnami/elasticsearch/README.md

@@ -52,6 +52,7 @@ The following table lists the configurable parameters of the Elasticsearch chart
 |            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)                                          |
 | `image.registry`                                  | Elasticsearch image registry                                                                                              | `docker.io`                                             |
 | `image.repository`                                | Elasticsearch image repository                                                                                            | `bitnami/elasticsearch`                                 |
 | `image.tag`                                       | Elasticsearch image tag                                                                                                   | `{VERSION}`                                             |

bitnami/elasticsearch/templates/_helpers.tpl

@@ -116,3 +116,38 @@ Return the proper sysctl image name
 {{- $tag := default "latest" .Values.sysctlImage.tag | toString -}}
 {{- printf "%s/%s:%s" $registryName .Values.sysctlImage.repository $tag -}}
 {{- end -}}
+
+{{/*
+Return the proper Docker Image Registry Secret Names
+*/}}
+{{- define "elasticsearch.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.image.pullSecrets .Values.metrics.image.pullSecrets }}
+imagePullSecrets:
+{{- range .Values.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.metrics.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end -}}
+{{- else if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets }}
+imagePullSecrets:
+{{- range .Values.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.metrics.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end -}}
+{{- end -}}

bitnami/elasticsearch/templates/coordinating-deploy.yaml

@@ -51,12 +51,7 @@ spec:
       {{- if .Values.coordinating.nodeAffinity }}
 {{ toYaml .Values.coordinating.nodeAffinity | indent 8 }}
       {{- end }}
-      {{- if .Values.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end}}
-      {{- end }}
+{{- include "elasticsearch.imagePullSecrets" . | indent 6 }}
       {{- if .Values.sysctlImage.enabled }}
       ## Image that performs the sysctl operation to modify Kernel settings (needed sometimes to avoid boot errors)
       initContainers:

bitnami/elasticsearch/templates/ingest-deploy.yaml

@@ -52,12 +52,7 @@ spec:
       {{- if .Values.ingest.nodeAffinity }}
 {{ toYaml .Values.ingest.nodeAffinity | indent 8 }}
       {{- end }}
-      {{- if .Values.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end}}
-      {{- end }}
+{{- include "elasticsearch.imagePullSecrets" . | indent 6 }}
       {{- if .Values.sysctlImage.enabled }}
       ## Image that performs the sysctl operation to modify Kernel settings (needed sometimes to avoid boot errors)
       initContainers:

bitnami/elasticsearch/templates/master-deploy.yaml

@@ -52,12 +52,7 @@ spec:
       {{- if .Values.master.nodeAffinity }}
 {{ toYaml .Values.master.nodeAffinity | indent 8 }}
       {{- end }}
-      {{- if .Values.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end}}
-      {{- end }}
+{{- include "elasticsearch.imagePullSecrets" . | indent 6 }}
       {{- if .Values.sysctlImage.enabled }}
       ## Image that performs the sysctl operation to modify Kernel settings (needed sometimes to avoid boot errors)
       initContainers:

bitnami/elasticsearch/templates/metrics-deploy.yaml

@@ -14,7 +14,7 @@ spec:
     matchLabels:
       app: {{ template "elasticsearch.name" . }}
       release: "{{ .Release.Name }}"
-      role: "metrics"      
+      role: "metrics"
   replicas: 1
   template:
     metadata:
@@ -24,12 +24,7 @@ spec:
         chart: {{ template "elasticsearch.chart" . }}
         role: "metrics"
     spec:
-      {{- if .Values.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end}}
-      {{- end }}
+{{- include "elasticsearch.imagePullSecrets" . | indent 6 }}
       containers:
       - name: {{ template "elasticsearch.metrics.fullname" . }}
         image:  {{ template "metrics.image" . }}

bitnami/elasticsearch/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
 
 ## Bitnami Elasticsearch image version
 ## ref: https://hub.docker.com/r/bitnami/elasticsearch/tags/
@@ -21,7 +24,7 @@ image:
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
   ##
   # pullSecrets:
-  #   - myRegistrKeySecretName
+  #   - myRegistryKeySecretName
 
 ## Image that performs the sysctl operation
 ##
@@ -40,7 +43,7 @@ sysctlImage:
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
   ##
   # pullSecrets:
-  #   - myRegistrKeySecretName
+  #   - myRegistryKeySecretName
 
 ## Elasticsearch cluster name
 ##