From 579976260f1e98a68066291764be11c124d44c4d Mon Sep 17 00:00:00 2001
From: lcooper40 <48589765+lcooper40@users.noreply.github.com>
Date: Mon, 17 Feb 2020 10:13:30 +0000
Subject: [PATCH] =?UTF-8?q?Added=20in=20code=20to=20allow=20control=20over?=
 =?UTF-8?q?=20pull=20policy=20for=20local=20path=20provis=E2=80=A6=20(#533?=
 =?UTF-8?q?4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Added in code to allow control over pull policy for local path provisioner

* change to imagePullPolicy to use globally used variable k8s_image_pull_policy

* removed unusued variable from defaults

* updated contiv-etcd and cinder-csi-controllerplugin to use k8s_image_pull_policy variable
---
 .../cinder/templates/cinder-csi-controllerplugin.yml.j2         | 2 +-
 .../templates/local-path-storage-deployment.yml.j2              | 2 +-
 roles/network_plugin/contiv/templates/contiv-etcd.yml.j2        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin.yml.j2 b/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin.yml.j2
index fc4b8ef3e..564451a3d 100644
--- a/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin.yml.j2
@@ -49,7 +49,7 @@ spec:
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
-          imagePullPolicy: Always
+          imagePullPolicy: {{ k8s_image_pull_policy }}
           volumeMounts:
             - mountPath: /var/lib/csi/sockets/pluginproxy/
               name: socket-dir
diff --git a/roles/kubernetes-apps/external_provisioner/local_path_provisioner/templates/local-path-storage-deployment.yml.j2 b/roles/kubernetes-apps/external_provisioner/local_path_provisioner/templates/local-path-storage-deployment.yml.j2
index 231d4c4ac..6922691cf 100644
--- a/roles/kubernetes-apps/external_provisioner/local_path_provisioner/templates/local-path-storage-deployment.yml.j2
+++ b/roles/kubernetes-apps/external_provisioner/local_path_provisioner/templates/local-path-storage-deployment.yml.j2
@@ -18,7 +18,7 @@ spec:
       containers:
       - name: local-path-provisioner
         image: {{ local_path_provisioner_image_repo }}:{{ local_path_provisioner_image_tag }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ k8s_image_pull_policy }}
         command:
         - local-path-provisioner
         - start
diff --git a/roles/network_plugin/contiv/templates/contiv-etcd.yml.j2 b/roles/network_plugin/contiv/templates/contiv-etcd.yml.j2
index 6341be719..5a8fae489 100644
--- a/roles/network_plugin/contiv/templates/contiv-etcd.yml.j2
+++ b/roles/network_plugin/contiv/templates/contiv-etcd.yml.j2
@@ -29,7 +29,7 @@ spec:
       initContainers:
         - name: contiv-etcd-init
           image: {{ contiv_etcd_init_image_repo }}:{{ contiv_etcd_init_image_tag }}
-          imagePullPolicy: Always
+          imagePullPolicy: {{ k8s_image_pull_policy }}
           env:
             - name: ETCD_INIT_ARGSFILE
               value: '{{ contiv_etcd_conf_dir }}/contiv-etcd-args'