enable setting docker registry for all images (#70)

Signed-off-by: Kenan Erdogan <[email protected]>
opensearch-project · Oct 7, 2021 · 3fcb0ee · 3fcb0ee
1 parent 97300bd
commit 3fcb0ee
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 5 deletions.
diff --git a/charts/opensearch/CHANGELOG.md b/charts/opensearch/CHANGELOG.md
@@ -13,6 +13,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 
+---
+## [1.0.5]
+### Added
+- In opensearch chart config to set the docker registry for images is added.
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+
 ---
 ## [1.0.4]
 ### Added

diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.4
+version: 1.0.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/opensearch/README.md b/charts/opensearch/README.md
@@ -44,6 +44,7 @@ To delete/uninstall the chart with the release name `my-release`:
 | `config`                         | Allows you to add any config files in `/usr/share/opensearch/config/` such as `opensearch.yml` and `log4j2.properties`. See [values.yaml][] for an example of the formatting                                                                        | `{}`                                            |
 | `opensearcjhJavaOpts`                       | Java options for OpenSearch. This is where you should configure the jvm heap size                                                                                                                                                             | `-Xmx1g -Xms1g`                                 |
 | `majorVersion`                   | Used to set major version specific configuration. If you are using a custom image and not running the default OpenSearch version you will need to set this to the version you are running (e.g. `majorVersion: 1`)                                   | `""`                                            |
+| `global.dockerRegistry`                  | Set if you want to change the default docker registry, e.g. a private one.                                                                                                                                           | `""`                                            |
 | `extraContainers`                  | Array of extra containers                                                                                                                                           | `""`                                            |
 | `extraEnvs`                        | Extra environments variables to be passed to OpenSearch services                                                                                                                           | `[]`                                            |
 | `extraInitContainers`              | Array of extra init containers                                                                                                                                          | `[]`                                            |

diff --git a/charts/opensearch/templates/_helpers.tpl b/charts/opensearch/templates/_helpers.tpl
@@ -59,3 +59,11 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
   {{- $version.Major }}
 {{- end }}
 {{- end }}
+
+{{- define "opensearch.dockerRegistry" -}}
+{{- if eq .Values.global.dockerRegistry "" -}}
+  {{- .Values.global.dockerRegistry -}}
+{{- else -}}
+  {{- .Values.global.dockerRegistry | trimSuffix "/" | printf "%s/" -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/opensearch/templates/statefulset.yaml b/charts/opensearch/templates/statefulset.yaml
@@ -215,7 +215,7 @@ spec:
       initContainers:
 {{- if .Values.persistence.enabled }}
       - name: fsgroup-volume
-        image: busybox
+        image: "{{ template "opensearch.dockerRegistry" . }}busybox:latest"
         command: ['sh', '-c']
         args:
           - 'chown -R 1000:1000 /usr/share/opensearch/data'
@@ -227,7 +227,7 @@ spec:
 {{- end }}      
 {{ if .Values.keystore }}
       - name: keystore
-        image: "{{ .Values.image }}:{{ .Values.imageTag | default .Chart.AppVersion }}"
+        image: "{{ template "opensearch.dockerRegistry" . }}{{ .Values.image }}:{{ .Values.imageTag | default .Chart.AppVersion }}"
         imagePullPolicy: "{{ .Values.imagePullPolicy }}"
         command:
         - sh
@@ -277,7 +277,7 @@ spec:
       - name: "{{ template "opensearch.name" . }}"
         securityContext:
 {{ toYaml .Values.securityContext | indent 10 }}
-        image: "{{ .Values.image }}:{{ .Values.imageTag | default .Chart.AppVersion }}"
+        image: "{{ template "opensearch.dockerRegistry" . }}{{ .Values.image }}:{{ .Values.imageTag | default .Chart.AppVersion }}"
         imagePullPolicy: "{{ .Values.imagePullPolicy }}"
         ports:
         - name: http
@@ -396,7 +396,7 @@ spec:
       {{- if eq .Values.roles.master "true" }}
       # This sidecar will prevent slow master re-election
       - name: opensearch-master-graceful-termination-handler
-        image: "{{ .Values.image }}:{{ .Values.imageTag | default .Chart.AppVersion }}"
+        image: "{{ template "opensearch.dockerRegistry" . }}{{ .Values.image }}:{{ .Values.imageTag | default .Chart.AppVersion }}"
         imagePullPolicy: "{{ .Values.imagePullPolicy }}"
         command:
         - "sh"

diff --git a/charts/opensearch/values.yaml b/charts/opensearch/values.yaml
@@ -20,6 +20,10 @@ minimumMasterNodes: 1
 # if not set, falls back to parsing .Values.imageTag, then .Chart.appVersion.
 majorVersion: ""
 
+global:
+  # Set if you want to change the default docker registry, e.g. a private one.
+  dockerRegistry: ""
+
 # Allows you to add any config files in {{ .Values.opensearchHome }}/config
 opensearchHome: /usr/share/opensearch
 # such as opensearch.yml and log4j2.properties