diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-19 17:15:14 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-21 08:11:56 +0000 |
| commit | 72bbabfb1592a18f639e152922ad5aeb14154f5e (patch) | |
| tree | db02c6bb9564d56e2a170f7ce56cc0b61c7288cd | |
| parent | 2b2aa11021114438591d184af19fde6bbf06950a (diff) | |
[COMMON][MARIADB-INIT] Uses new tpls for repos / images
This commit makes mariadb init template to use the new generator for
repositories and images.
As mariadb images are coming from dockerhub, we're using directly this
repository.
Issue-ID: OOM-2364
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I21e99fc4c7c4d968b393d27dfad2b51bcc5c2cfd
| -rw-r--r-- | kubernetes/common/mariadb-init/requirements.yaml | 5 | ||||
| -rw-r--r-- | kubernetes/common/mariadb-init/templates/job.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/common/mariadb-init/values.yaml | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kubernetes/common/mariadb-init/requirements.yaml b/kubernetes/common/mariadb-init/requirements.yaml index 4fbecbfab2..2509f7fcff 100644 --- a/kubernetes/common/mariadb-init/requirements.yaml +++ b/kubernetes/common/mariadb-init/requirements.yaml @@ -15,4 +15,7 @@ dependencies: - name: common version: ~6.x-0 - repository: 'file://../common'
\ No newline at end of file + repository: 'file://../common' + - name: repositoryGenerator + version: ~6.x-0 + repository: 'file://../repositoryGenerator'
\ No newline at end of file diff --git a/kubernetes/common/mariadb-init/templates/job.yaml b/kubernetes/common/mariadb-init/templates/job.yaml index fb06568777..ad97cd4ed6 100644 --- a/kubernetes/common/mariadb-init/templates/job.yaml +++ b/kubernetes/common/mariadb-init/templates/job.yaml @@ -49,11 +49,11 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.image.mariadb" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: - /bin/sh diff --git a/kubernetes/common/mariadb-init/values.yaml b/kubernetes/common/mariadb-init/values.yaml index 42a1513449..b2c0a05e46 100644 --- a/kubernetes/common/mariadb-init/values.yaml +++ b/kubernetes/common/mariadb-init/values.yaml @@ -16,8 +16,6 @@ # Global configuration defaults. ################################################################# global: - repository: nexus3.onap.org:10001 - readinessImage: onap/oom/readiness:3.0.1 mariadbGalera: nameOverride: mariadb-galera servicePort: 3306 @@ -45,7 +43,6 @@ secrets: # Application configuration defaults. ################################################################# -image: mariadb:10.1.38 pullPolicy: IfNotPresent # These two values are used to supply commands that are run after the DB is created. |