From 6ad3a1c8e3e74c4af3912adf1c982b131c163e77 Mon Sep 17 00:00:00 2001
From: dkamdocs <devesh.kumar@amdocs.com>
Date: Fri, 21 Dec 2018 09:25:53 +0000
Subject: global image pull issue Issue-ID: OOM-1563

Change-Id: I383dbec29291ba5b13d613f60d8eb343b9c59dda
Signed-off-by: dkamdocs <devesh.kumar@amdocs.com>
---
 kubernetes/common/music/charts/zookeeper/templates/job-chroots.yaml | 2 +-
 kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kubernetes/common/music/charts/zookeeper')

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 }}
-- 
cgit 1.2.3-korg