From b6458200611aeeecb6a863835392a985a0dcf775 Mon Sep 17 00:00:00 2001
From: Dmitry Ukov <dukov@mirantis.com>
Date: Thu, 27 Feb 2020 19:46:13 +0400
Subject: [PATCH] Remove IMAGE_PULL_POLICY variable

Since value of imagePullPolicy key is a one word string it can be easily
overridden by strategicMerge

Change-Id: I3d78765ce3fb277bc7825639746b734f655efcf0
---
 manifests/function/baremetal-provider/kustomization.yaml | 5 -----
 manifests/function/baremetal-provider/provider.yaml      | 2 +-
 manifests/function/cluster-api/kustomization.yaml        | 5 -----
 manifests/function/cluster-api/operator.yaml             | 2 +-
 manifests/function/kubeadm/kustomization.yaml            | 5 -----
 manifests/function/kubeadm/provider.yaml                 | 4 ++--
 6 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/manifests/function/baremetal-provider/kustomization.yaml b/manifests/function/baremetal-provider/kustomization.yaml
index 28342dde3..bc491f2a1 100644
--- a/manifests/function/baremetal-provider/kustomization.yaml
+++ b/manifests/function/baremetal-provider/kustomization.yaml
@@ -11,8 +11,3 @@ commonLabels:
   airshipit.org/target: "true"
 
 namespace: capbm
-
-#vars:
-# $(IMAGE_PULL_POLICY)
-# The image pull policy by default should be "IfNotPresent",
-# it should be globally defined for all images
diff --git a/manifests/function/baremetal-provider/provider.yaml b/manifests/function/baremetal-provider/provider.yaml
index 72f62e07d..4df0e5fb0 100644
--- a/manifests/function/baremetal-provider/provider.yaml
+++ b/manifests/function/baremetal-provider/provider.yaml
@@ -83,7 +83,7 @@ spec:
         - name: SECRET_NAME
           value: capbm-webhook-server-secret
         image: "quay.io/metal3-io/cluster-api-provider-baremetal:v1alpha2"
-        imagePullPolicy: $(IMAGE_PULL_POLICY)
+        imagePullPolicy: Always
         name: manager
         ports:
         - containerPort: 9876
diff --git a/manifests/function/cluster-api/kustomization.yaml b/manifests/function/cluster-api/kustomization.yaml
index 2dd0273d0..c94ec74c2 100644
--- a/manifests/function/cluster-api/kustomization.yaml
+++ b/manifests/function/cluster-api/kustomization.yaml
@@ -11,8 +11,3 @@ commonLabels:
   airshipit.org/target: "true"
 
 namespace: capi
-
-#vars:
-# $(IMAGE_PULL_POLICY)
-# The image pull policy by default should be "IfNotPresent",
-# it should be globally defined for all images
diff --git a/manifests/function/cluster-api/operator.yaml b/manifests/function/cluster-api/operator.yaml
index 36dbf4344..e19ab1591 100644
--- a/manifests/function/cluster-api/operator.yaml
+++ b/manifests/function/cluster-api/operator.yaml
@@ -36,7 +36,7 @@ spec:
       - command:
         - /manager
         image: "gcr.io/k8s-staging-cluster-api/cluster-api-controller:release-0.2"
-        imagePullPolicy: $(IMAGE_PULL_POLICY)
+        imagePullPolicy: Always
         name: manager
         resources:
           limits:
diff --git a/manifests/function/kubeadm/kustomization.yaml b/manifests/function/kubeadm/kustomization.yaml
index 17fbc9fa9..3ef7f43e2 100644
--- a/manifests/function/kubeadm/kustomization.yaml
+++ b/manifests/function/kubeadm/kustomization.yaml
@@ -11,8 +11,3 @@ commonLabels:
   airshipit.org/target: "true"
 
 namespace: capbk
-
-#vars:
-# $(IMAGE_PULL_POLICY)
-# The image pull policy by default should be "IfNotPresent",
-# it should be globally defined for all images
diff --git a/manifests/function/kubeadm/provider.yaml b/manifests/function/kubeadm/provider.yaml
index 221851704..cba0a9635 100644
--- a/manifests/function/kubeadm/provider.yaml
+++ b/manifests/function/kubeadm/provider.yaml
@@ -40,7 +40,7 @@ spec:
         - --logtostderr=true
         - --v=10
         image: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0
-        imagePullPolicy: $(IMAGE_PULL_POLICY)
+        imagePullPolicy: Always
         name: kube-rbac-proxy
         ports:
         - containerPort: 8443
@@ -50,7 +50,7 @@ spec:
         - --v=4
         - --enable-leader-election
         image: gcr.io/k8s-staging-capi-kubeadm/cluster-api-kubeadm-controller:latest
-        imagePullPolicy: $(IMAGE_PULL_POLICY)
+        imagePullPolicy: Always
         name: manager
       terminationGracePeriodSeconds: 10
       tolerations: