From dbe6eb20c86d22a8593b6957da19e3675ff8fbfb Mon Sep 17 00:00:00 2001
From: Samuel Liu <liupeng0518@gmail.com>
Date: Tue, 13 Oct 2020 08:45:22 +0800
Subject: [PATCH] Modify imagepullpolicy (#6816)

---
 .../ambassador/templates/deploy-ambassador.yml.j2             | 2 +-
 roles/kubernetes-apps/metallb/templates/metallb.yml.j2        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/kubernetes-apps/ingress_controller/ambassador/templates/deploy-ambassador.yml.j2 b/roles/kubernetes-apps/ingress_controller/ambassador/templates/deploy-ambassador.yml.j2
index 1cfa8e1bb..8cf4676d5 100644
--- a/roles/kubernetes-apps/ingress_controller/ambassador/templates/deploy-ambassador.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/ambassador/templates/deploy-ambassador.yml.j2
@@ -29,7 +29,7 @@ spec:
           image: {{ ingress_ambassador_image_repo }}:{{ ingress_ambassador_image_tag }}
           command:
           - ambassador-operator
-          imagePullPolicy: Always
+          imagePullPolicy: {{ k8s_image_pull_policy }}
           env:
             - name: WATCH_NAMESPACE
               valueFrom:
diff --git a/roles/kubernetes-apps/metallb/templates/metallb.yml.j2 b/roles/kubernetes-apps/metallb/templates/metallb.yml.j2
index bad2fdd13..4b0989e0d 100644
--- a/roles/kubernetes-apps/metallb/templates/metallb.yml.j2
+++ b/roles/kubernetes-apps/metallb/templates/metallb.yml.j2
@@ -318,7 +318,7 @@ spec:
               name: memberlist
               key: secretkey
         image: {{ metallb_speaker_image_repo }}:{{ metallb_version }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ k8s_image_pull_policy }}
         name: speaker
         ports:
         - containerPort: {{ metallb_port }}
@@ -374,7 +374,7 @@ spec:
         - --port={{ metallb_port }}
         - --config=config
         image: {{ metallb_controller_image_repo }}:{{ metallb_version }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ k8s_image_pull_policy }}
         name: controller
         ports:
         - containerPort: {{ metallb_port }}