diff options
author | Borislav Glozman <Borislav.Glozman@amdocs.com> | 2019-01-17 10:45:45 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-01-17 10:45:45 +0000 |
commit | 6758b55235ad56583163aa6abdb388c082c412f4 (patch) | |
tree | 0e35e07d00fa472c706e0175524a8737c908c969 /kubernetes/oof/charts/oof-has | |
parent | 54dc9203a3b902c7002d93d80db7b2ad27f2fe99 (diff) | |
parent | 6ad3a1c8e3e74c4af3912adf1c982b131c163e77 (diff) |
Merge "global image pull issue Issue-ID: OOM-1563"
Diffstat (limited to 'kubernetes/oof/charts/oof-has')
-rwxr-xr-x | kubernetes/oof/charts/oof-has/templates/job-healthcheck.yaml | 4 | ||||
-rwxr-xr-x | kubernetes/oof/charts/oof-has/templates/job-onboard.yaml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kubernetes/oof/charts/oof-has/templates/job-healthcheck.yaml b/kubernetes/oof/charts/oof-has/templates/job-healthcheck.yaml index 6e38034c46..ca3501aa8c 100755 --- a/kubernetes/oof/charts/oof-has/templates/job-healthcheck.yaml +++ b/kubernetes/oof/charts/oof-has/templates/job-healthcheck.yaml @@ -49,7 +49,7 @@ spec: fieldPath: metadata.namespace containers: - image: "{{ include "common.repository" . }}/{{ .Values.global.image.optf_has }}" - imagePullPolicy: {{ .Values.pullPolicy }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-healthcheck command: - "/bin/sh" @@ -97,4 +97,4 @@ spec: path: healthcheck.json restartPolicy: OnFailure imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file + - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/oof/charts/oof-has/templates/job-onboard.yaml b/kubernetes/oof/charts/oof-has/templates/job-onboard.yaml index 2b24d4017d..a27e190385 100755 --- a/kubernetes/oof/charts/oof-has/templates/job-onboard.yaml +++ b/kubernetes/oof/charts/oof-has/templates/job-onboard.yaml @@ -65,7 +65,7 @@ spec: name: {{ include "common.name" . }}-music-db-readiness containers: - image: "{{ include "common.repository" . }}/{{ .Values.global.image.optf_has }}" - imagePullPolicy: {{ .Values.pullPolicy }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-onboard command: - "/bin/sh" @@ -105,4 +105,4 @@ spec: path: onboard.json restartPolicy: OnFailure imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file + - name: "{{ include "common.namespace" . }}-docker-registry-key" |