[Portal] Move (unused) readinessImage to global

All helm charts in ONAP are setting readinessImage to global part (it
can then be easy to bump version for everybody at once).

Portal Job is not using it and use a local version.
Move to use global one for consistency

Issue-ID: OOM-2373
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I5400ab595773ffc7111bc43f64c48b7c9a4c2dcd

diff --git a/kubernetes/portal/charts/portal-mariadb/templates/job.yaml b/kubernetes/portal/charts/portal-mariadb/templates/job.yaml
index b6495c9..812dc66 100644 (file)
--- a/kubernetes/portal/charts/portal-mariadb/templates/job.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/templates/job.yaml
@@ -33,7 +33,7 @@ spec:
       restartPolicy: Never
       initContainers:
       - name: {{ include "common.name" . }}-init-readiness
-        image: "{{ .Values.global.readinessRepository }}/{{ .Values.readinessImage }}"
+        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         command:
         - /root/ready.py

diff --git a/kubernetes/portal/charts/portal-mariadb/values.yaml b/kubernetes/portal/charts/portal-mariadb/values.yaml
index 26afa60..5a3b08d 100644 (file)
--- a/kubernetes/portal/charts/portal-mariadb/values.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/values.yaml
@@ -20,6 +20,7 @@ global: # global defaults
   nodePortPrefix: 302
   persistence: {}
   readinessRepository: oomk8s
+  readinessImage: readiness-check:2.0.0
 
 
 # application image
@@ -27,7 +28,7 @@ repository: nexus3.onap.org:10001
 image: onap/portal-db:3.2.0
 pullPolicy: Always
 
-readinessImage: readiness-check:2.0.0
+
 mariadbInitImage: "mariadb-client-init:3.0.0"
 
 # application configuration