summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-04-22 11:24:23 +0000
committerGerrit Code Review <gerrit@onap.org>2020-04-22 11:24:23 +0000
commit61b1c7bef72bf31e0c5b4c3241121e43082a1a01 (patch)
treed677711c28dd90e29aefbc3bd35705cf05b2e47d /kubernetes
parent648412a4004c68fa94888f59db36090c746f030e (diff)
parent92028e1bfc1c2c3a25b336d460aa579978e8f678 (diff)
Merge "[Portal] Move (unused) readinessImage to global"
Diffstat (limited to 'kubernetes')
-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 b62aab93a8..1234b6bc46 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