diff options
author | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-19 17:40:05 +0100 |
---|---|---|
committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-21 08:14:02 +0000 |
commit | 747982c26fb62c0605541117a9b8a5fd00a3fc32 (patch) | |
tree | 2353923afe24a0569f73278953b2bf1bfec8a257 /kubernetes/so/components/so-mariadb | |
parent | 2b2aa11021114438591d184af19fde6bbf06950a (diff) |
[SO] Uses new tpls for repos / images
This commit makes SO chart to use the new generator for repositories and
images.
Issue-ID: OOM-2364
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: Ife4e1fcfff565b3ada7e726913826e2c9f76bc07
Diffstat (limited to 'kubernetes/so/components/so-mariadb')
-rwxr-xr-x | kubernetes/so/components/so-mariadb/requirements.yaml | 3 | ||||
-rw-r--r-- | kubernetes/so/components/so-mariadb/templates/job.yaml | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/kubernetes/so/components/so-mariadb/requirements.yaml b/kubernetes/so/components/so-mariadb/requirements.yaml index 22d6333253..0dfef90cff 100755 --- a/kubernetes/so/components/so-mariadb/requirements.yaml +++ b/kubernetes/so/components/so-mariadb/requirements.yaml @@ -18,6 +18,9 @@ dependencies: # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' - name: readinessCheck version: ~6.x-0 repository: '@local' diff --git a/kubernetes/so/components/so-mariadb/templates/job.yaml b/kubernetes/so/components/so-mariadb/templates/job.yaml index b3bacc1ed4..0eeba7b61a 100644 --- a/kubernetes/so/components/so-mariadb/templates/job.yaml +++ b/kubernetes/so/components/so-mariadb/templates/job.yaml @@ -39,7 +39,7 @@ spec: spec: containers: - name: {{ include "common.fullname" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: DB_HOST @@ -98,7 +98,7 @@ spec: initContainers: {{ include "common.readinessCheck.waitFor" . | nindent 6 }} containers: - name: {{ include "common.name" . }}-config - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: - /bin/bash |