WIP on (no branch): 18b2741 Merge pull request kubernetes-sigs#4607 from chymy/fix-comment-0513

git stash · git stash · commit f0ce08789224 · 2021-05-27T07:20:59.000Z
diff --git a/bootstrap/kubeadm/config/default/manager_image_patch.yaml b/bootstrap/kubeadm/config/default/manager_image_patch.yaml
@@ -7,5 +7,5 @@ spec:
   template:
     spec:
       containers:
-        - image: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:master
+        - image: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller-amd64:dev
           name: manager
diff --git a/bootstrap/kubeadm/config/default/manager_pull_policy.yaml b/bootstrap/kubeadm/config/default/manager_pull_policy.yaml
@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
       - name: manager
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml
@@ -7,5 +7,5 @@ spec:
   template:
     spec:
       containers:
-      - image: gcr.io/k8s-staging-cluster-api/cluster-api-controller:master
+      - image: gcr.io/k8s-staging-cluster-api/cluster-api-controller-amd64:dev
         name: manager
diff --git a/config/default/manager_pull_policy.yaml b/config/default/manager_pull_policy.yaml
@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
       - name: manager
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
diff --git a/controlplane/kubeadm/config/default/manager_image_patch.yaml b/controlplane/kubeadm/config/default/manager_image_patch.yaml
@@ -7,5 +7,5 @@ spec:
   template:
     spec:
       containers:
-        - image: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:master
+        - image: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller-amd64:dev
           name: manager
diff --git a/controlplane/kubeadm/config/default/manager_pull_policy.yaml b/controlplane/kubeadm/config/default/manager_pull_policy.yaml
@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
       - name: manager
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
diff --git a/test/infrastructure/docker/config/default/manager_image_patch.yaml b/test/infrastructure/docker/config/default/manager_image_patch.yaml
@@ -8,5 +8,5 @@ spec:
     spec:
       containers:
       # Change the value of image field below to your controller image URL
-      - image: gcr.io/k8s-staging-cluster-api/capd-manager:master
+      - image: gcr.io/k8s-staging-cluster-api/capd-manager-amd64:dev
         name: manager
diff --git a/test/infrastructure/docker/config/default/manager_pull_policy.yaml b/test/infrastructure/docker/config/default/manager_pull_policy.yaml
@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
       - name: manager
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
