commit 220a1d3986f5f42b136548bd139cf089060d5825
author Krzysztof Opasiak <k.opasiak@samsung.com> Mon Nov 23 11:30:02 2020 +0000
committer Gerrit Code Review <gerrit@onap.org> Mon Nov 23 11:30:02 2020 +0000
tree 6fa0e825aba49b963e52aadca84f79c98aa47339
parent 38b642443281162cc4c9d709d5ab523646adb678
parent 72bbabfb1592a18f639e152922ad5aeb14154f5e

Merge "[COMMON][MARIADB-INIT] Uses new tpls for repos / images"

kubernetes/common/mariadb-init/requirements.yaml

diff --git a/kubernetes/common/mariadb-init/requirements.yaml b/kubernetes/common/mariadb-init/requirements.yaml
index 4fbecbf..2509f7f 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

kubernetes/common/mariadb-init/templates/job.yaml

diff --git a/kubernetes/common/mariadb-init/templates/job.yaml b/kubernetes/common/mariadb-init/templates/job.yaml
index fb06568..ad97cd4 100644
--- a/kubernetes/common/mariadb-init/templates/job.yaml
+++ b/kubernetes/common/mariadb-init/templates/job.yaml
@@ -49,11 +49,11 @@
             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

kubernetes/common/mariadb-init/values.yaml

diff --git a/kubernetes/common/mariadb-init/values.yaml b/kubernetes/common/mariadb-init/values.yaml
index 42a1513..b2c0a05 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 @@
 # 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.