Merge pull request kubernetes-sigs#1661 from shiftstack/issue1658

🐛Fix failing clusterctl upgrade test (second attempt)

Author: k8s-ci-robot

test/e2e/data/e2e_conf.yaml

@@ -43,6 +43,18 @@ providers:
       new: "imagePullPolicy: IfNotPresent"
     - old: "--leader-elect"
       new: "--leader-elect=false\n        - --sync-period=1m"
+  # For clusterctl upgrade test
+  - name: v1.4.6
+    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.6/core-components.yaml"
+    type: url
+    contract: v1beta1
+    files:
+    - sourcePath: "../data/shared/v1beta1/metadata.yaml"
+    replacements:
+    - old: "imagePullPolicy: Always"
+      new: "imagePullPolicy: IfNotPresent"
+    - old: "--leader-elect"
+      new: "--leader-elect=false\n        - --sync-period=1m"
 - name: kubeadm
   type: BootstrapProvider
   versions:
@@ -57,6 +69,18 @@ providers:
       new: "imagePullPolicy: IfNotPresent"
     - old: "--leader-elect"
       new: "--leader-elect=false\n        - --sync-period=1m"
+  # For clusterctl upgrade test
+  - name: v1.4.6
+    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.6/bootstrap-components.yaml"
+    type: url
+    contract: v1beta1
+    files:
+    - sourcePath: "../data/shared/v1beta1/metadata.yaml"
+    replacements:
+    - old: "imagePullPolicy: Always"
+      new: "imagePullPolicy: IfNotPresent"
+    - old: "--leader-elect"
+      new: "--leader-elect=false\n        - --sync-period=1m"
 - name: kubeadm
   type: ControlPlaneProvider
   versions:
@@ -71,6 +95,18 @@ providers:
       new: "imagePullPolicy: IfNotPresent"
     - old: "--leader-elect"
       new: "--leader-elect=false\n        - --sync-period=1m"
+  # For clusterctl upgrade test
+  - name: v1.4.6
+    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.6/control-plane-components.yaml"
+    type: url
+    contract: v1beta1
+    files:
+    - sourcePath: "../data/shared/v1beta1/metadata.yaml"
+    replacements:
+    - old: "imagePullPolicy: Always"
+      new: "imagePullPolicy: IfNotPresent"
+    - old: "--leader-elect"
+      new: "--leader-elect=false\n        - --sync-period=1m"
 - name: openstack
   type: InfrastructureProvider
   versions: