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 | ad86ad7236cfd65b055e9af9b82968244dd62d82 (patch) | |
| tree | 32b157c11aa48dec541fd721c71c6aeafbfab8b6 /charts/aaf-sshsm | |
| parent | 3c4efc767047a358b8dc9373e02de6b096f7a973 (diff) | |
| parent | abb13fe77c54bdc876f6b7c4833d113f553c04ac (diff) | |
Merge "global image pull issue Issue-ID: OOM-1563"
Diffstat (limited to 'charts/aaf-sshsm')
4 files changed, 5 insertions, 5 deletions
diff --git a/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/job.yaml b/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/job.yaml index 8b2e0b8..5618dd5 100644 --- a/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/job.yaml +++ b/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/job.yaml @@ -38,7 +38,7 @@ spec: containers: - name: {{ include "common.name" . }}-job image: "{{ include "common.repository" . }}/{{ .Values.image }}" - imagePullPolicy: {{ .Values.pullPolicy }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: ["/abrmd/bin/initialize_tpm.sh"] workingDir: /abrmd/bin securityContext: diff --git a/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/statefulset.yaml b/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/statefulset.yaml index a3a2004..4a1dd5c 100644 --- a/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/statefulset.yaml +++ b/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/statefulset.yaml @@ -53,7 +53,7 @@ spec: containers: - image: "{{ include "common.repository" . }}/{{ .Values.image }}" name: {{ include "common.name" . }} - imagePullPolicy: {{ .Values.pullPolicy }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: ["/abrmd/bin/run_abrmd.sh"] workingDir: /abrmd/bin securityContext: diff --git a/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/job.yaml b/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/job.yaml index 69a9956..3db88b6 100644 --- a/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/job.yaml +++ b/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/job.yaml @@ -73,7 +73,7 @@ spec: containers: - image: "{{ include "common.repository" . }}/{{ .Values.image }}" name: {{ include "common.name" . }} - imagePullPolicy: {{ .Values.pullPolicy }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: ["/entrypoint.sh"] workingDir: /distcenter volumeMounts: @@ -102,4 +102,4 @@ spec: imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" -{{- end -}}
\ No newline at end of file +{{- end -}} diff --git a/charts/aaf-sshsm/charts/aaf-sshsm-testca/templates/job.yaml b/charts/aaf-sshsm/charts/aaf-sshsm-testca/templates/job.yaml index 304f974..fc993df 100644 --- a/charts/aaf-sshsm/charts/aaf-sshsm-testca/templates/job.yaml +++ b/charts/aaf-sshsm/charts/aaf-sshsm-testca/templates/job.yaml @@ -70,7 +70,7 @@ spec: containers: - image: "{{ include "common.repository" . }}/{{ .Values.image }}" name: {{ include "common.name" . }} - imagePullPolicy: {{ .Values.pullPolicy }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: ["./import.sh"] workingDir: /testca/bin env: |