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/common/music | |
| parent | 54dc9203a3b902c7002d93d80db7b2ad27f2fe99 (diff) | |
| parent | 6ad3a1c8e3e74c4af3912adf1c982b131c163e77 (diff) | |
Merge "global image pull issue Issue-ID: OOM-1563"
Diffstat (limited to 'kubernetes/common/music')
| -rw-r--r-- | kubernetes/common/music/charts/zookeeper/templates/job-chroots.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kubernetes/common/music/charts/zookeeper/templates/job-chroots.yaml b/kubernetes/common/music/charts/zookeeper/templates/job-chroots.yaml index 38592ddeac..b5b97233a0 100644 --- a/kubernetes/common/music/charts/zookeeper/templates/job-chroots.yaml +++ b/kubernetes/common/music/charts/zookeeper/templates/job-chroots.yaml @@ -33,7 +33,7 @@ spec: containers: - name: main image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.image.pullPolicy }} command: - /bin/bash - -o diff --git a/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml b/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml index 135b59e2b6..9e3549f20d 100644 --- a/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml +++ b/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml @@ -58,7 +58,7 @@ spec: - name: zookeeper image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.image.pullPolicy }} command: - /bin/bash - -xec @@ -88,7 +88,7 @@ spec: {{- if .Values.exporters.jmx.enabled }} - name: jmx-exporter image: "{{ .Values.exporters.jmx.image.repository }}:{{ .Values.exporters.jmx.image.tag }}" - imagePullPolicy: {{ .Values.exporters.jmx.image.pullPolicy }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.exporters.jmx.image.pullPolicy }} ports: {{- range $key, $port := .Values.exporters.jmx.ports }} - name: {{ $key }} @@ -118,7 +118,7 @@ spec: {{- if .Values.exporters.zookeeper.enabled }} - name: zookeeper-exporter image: "{{ .Values.exporters.zookeeper.image.repository }}:{{ .Values.exporters.zookeeper.image.tag }}" - imagePullPolicy: {{ .Values.exporters.zookeeper.image.pullPolicy }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.exporters.zookeeper.image.pullPolicy }} args: - -bind-addr=:{{ .Values.exporters.zookeeper.ports.zookeeperxp.containerPort }} - -metrics-path={{ .Values.exporters.zookeeper.path }} |