diff options
| author |   Mandeep Khinda <mandeep.khinda@amdocs.com> | 2018-04-10 21:35:54 -0400 |
|---|---|---|
| committer | Mandeep Khinda <mandeep.khinda@amdocs.com> | 2018-04-11 21:37:05 +0000 |
| commit | 06ad9b7ab0cdecb9af73cbf7e2ac9684039b536d (patch) | |
| tree | 773dcf4b42c5db62c2fb169e595bfee814f70ebf /kubernetes | |
| parent | f39bd633c0acea07c3502a984178afa65f6c2b52 (diff) | |
fixing invalid portal db images
Finding strange issues with image pulling and names subst.
When using registry.hub.docker.com and an Always pull policy
the Job pod would sit there pulling images forever even though
they are actually up to date and present.
Therefore reverting back to plain old oomk8s/blah
Issue-ID: OOM-746
Change-Id: Iec5de0e1314ac85fa4e8de6599922f1e0fd0e367
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Diffstat (limited to 'kubernetes')
| -rw-r--r-- | kubernetes/portal/charts/portal-mariadb/templates/job.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/portal/charts/portal-mariadb/values.yaml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kubernetes/portal/charts/portal-mariadb/templates/job.yaml b/kubernetes/portal/charts/portal-mariadb/templates/job.yaml index af14f44129..5dad1c0002 100644 --- a/kubernetes/portal/charts/portal-mariadb/templates/job.yaml +++ b/kubernetes/portal/charts/portal-mariadb/templates/job.yaml @@ -32,7 +32,7 @@ spec: restartPolicy: Never initContainers: - name: {{ include "common.name" . }}-init-readiness - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + image: "{{ .Values.global.readinessRepository }}/{{ .Values.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: - /root/ready.py @@ -47,7 +47,7 @@ spec: fieldPath: metadata.namespace containers: - name: {{ include "common.name" . }}-job - image: "{{ .Values.global.repository | default .Values.dockerHubRepository }}/{{ .Values.mariadbInitImage }}" + image: "{{ .Values.global.readinessRepository }}/{{ .Values.mariadbInitImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: DB_HOST @@ -60,7 +60,7 @@ spec: - name: SQL_SRC_DIR value: {{ .Values.config.sqlSourceDirectory }} - name: {{ include "common.name" . }}-oom-update-job - image: "{{ .Values.global.repository | default .Values.dockerHubRepository }}/{{ .Values.mariadbInitImage }}" + image: "{{ .Values.global.readinessRepository }}/{{ .Values.mariadbInitImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: DB_HOST diff --git a/kubernetes/portal/charts/portal-mariadb/values.yaml b/kubernetes/portal/charts/portal-mariadb/values.yaml index 54267fe2e8..c232e4ca4a 100644 --- a/kubernetes/portal/charts/portal-mariadb/values.yaml +++ b/kubernetes/portal/charts/portal-mariadb/values.yaml @@ -19,6 +19,7 @@ global: # global defaults nodePortPrefix: 302 repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ== persistence: {} + readinessRepository: oomk8s # application image @@ -26,9 +27,8 @@ repository: nexus3.onap.org:10001 image: onap/portal-db:2.1-STAGING-latest pullPolicy: Always -#mariadbInitImage: oomk8s/flyway:1.0 -dockerhubRepository: registry.hub.docker.com -mariadbInitImage: oomk8s/mariadb-client-init:2.0.0 +readinessImage: "readiness-check:1.1.1" +mariadbInitImage: "mariadb-client-init:2.0.0" # application configuration config: |