aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/portal/charts/portal-mariadb
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-04-20 12:02:24 +0200
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-04-20 12:05:17 +0200
commit92028e1bfc1c2c3a25b336d460aa579978e8f678 (patch)
tree22de5068dfdf645f4b81d3083b84d1246ced10df /kubernetes/portal/charts/portal-mariadb
parent811fdec95acf7b10fdcbab3da96306f3c8689eb0 (diff)
[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
Diffstat (limited to 'kubernetes/portal/charts/portal-mariadb')
-rw-r--r--kubernetes/portal/charts/portal-mariadb/templates/job.yaml2
-rw-r--r--kubernetes/portal/charts/portal-mariadb/values.yaml3
2 files changed, 3 insertions, 2 deletions
diff --git a/kubernetes/portal/charts/portal-mariadb/templates/job.yaml b/kubernetes/portal/charts/portal-mariadb/templates/job.yaml
index b6495c93fd..812dc66a23 100644
--- 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 26afa60616..5a3b08d469 100644
--- 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