bump capi v1.5 and v1.4

kubernetes-sigs · Dec 6, 2023 · 0fa96c7 · 0fa96c7
1 parent ab8543e
commit 0fa96c7
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 32 deletions.
diff --git a/test/e2e/clusterctl_upgrade_test.go b/test/e2e/clusterctl_upgrade_test.go
@@ -33,10 +33,10 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.8=
 			SkipCleanup:                       skipCleanup,
 			InitWithProvidersContract:         "v1beta1",
 			MgmtFlavor:                        "remote-management",
-			InitWithBinary:                    "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/clusterctl-{OS}-{ARCH}",
-			InitWithCoreProvider:              "cluster-api:v1.5.3",
-			InitWithBootstrapProviders:        []string{"kubeadm:v1.5.3"},
-			InitWithControlPlaneProviders:     []string{"kubeadm:v1.5.3"},
+			InitWithBinary:                    "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/clusterctl-{OS}-{ARCH}",
+			InitWithCoreProvider:              "cluster-api:v1.5.4",
+			InitWithBootstrapProviders:        []string{"kubeadm:v1.5.4"},
+			InitWithControlPlaneProviders:     []string{"kubeadm:v1.5.4"},
 			InitWithInfrastructureProviders:   []string{"vsphere:v1.8.4"},
 			InitWithRuntimeExtensionProviders: []string{},
 			InitWithKubernetesVersion:         "v1.28.0",
@@ -56,10 +56,10 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.7=
 			SkipCleanup:                       skipCleanup,
 			InitWithProvidersContract:         "v1beta1",
 			MgmtFlavor:                        "remote-management",
-			InitWithBinary:                    "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/clusterctl-{OS}-{ARCH}",
-			InitWithCoreProvider:              "cluster-api:v1.4.7",
-			InitWithBootstrapProviders:        []string{"kubeadm:v1.4.7"},
-			InitWithControlPlaneProviders:     []string{"kubeadm:v1.4.7"},
+			InitWithBinary:                    "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/clusterctl-{OS}-{ARCH}",
+			InitWithCoreProvider:              "cluster-api:v1.4.9",
+			InitWithBootstrapProviders:        []string{"kubeadm:v1.4.9"},
+			InitWithControlPlaneProviders:     []string{"kubeadm:v1.4.9"},
 			InitWithInfrastructureProviders:   []string{"vsphere:v1.7.4"},
 			InitWithRuntimeExtensionProviders: []string{},
 			InitWithKubernetesVersion:         "v1.27.3",

diff --git a/test/e2e/config/vsphere-ci.yaml b/test/e2e/config/vsphere-ci.yaml
@@ -38,19 +38,19 @@ providers:
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.5.3
+      - name: v1.5.4
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/core-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/core-components.yaml"
         type: "url"
         contract: v1beta1
         files:
           - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.4.7
+      - name: v1.4.9
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/core-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/core-components.yaml"
         type: "url"
         contract: v1beta1
         files:
@@ -72,19 +72,19 @@ providers:
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.5.3
+      - name: v1.5.4
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/bootstrap-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/bootstrap-components.yaml"
         type: "url"
         contract: v1beta1
         files:
           - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.4.7
+      - name: v1.4.9
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/bootstrap-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/bootstrap-components.yaml"
         type: "url"
         contract: v1beta1
         files:
@@ -106,19 +106,19 @@ providers:
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.5.3
+      - name: v1.5.4
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/control-plane-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/control-plane-components.yaml"
         type: "url"
         contract: v1beta1
         files:
           - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.4.7
+      - name: v1.4.9
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/control-plane-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/control-plane-components.yaml"
         type: "url"
         contract: v1beta1
         files:

diff --git a/test/e2e/config/vsphere-dev.yaml b/test/e2e/config/vsphere-dev.yaml
@@ -41,19 +41,19 @@ providers:
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.5.3
+      - name: v1.5.4
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/core-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/core-components.yaml"
         type: "url"
         contract: v1beta1
         files:
           - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.4.7
+      - name: v1.4.
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/core-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4./core-components.yaml"
         type: "url"
         contract: v1beta1
         files:
@@ -75,19 +75,19 @@ providers:
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.5.3
+      - name: v1.5.4
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/bootstrap-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/bootstrap-components.yaml"
         type: "url"
         contract: v1beta1
         files:
           - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.4.7
+      - name: v1.4.
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/bootstrap-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4./bootstrap-components.yaml"
         type: "url"
         contract: v1beta1
         files:
@@ -109,19 +109,19 @@ providers:
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.5.3
+      - name: v1.5.4
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/control-plane-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/control-plane-components.yaml"
         type: "url"
         contract: v1beta1
         files:
           - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.4.7
+      - name: v1.4.
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/control-plane-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4./control-plane-components.yaml"
         type: "url"
         contract: v1beta1
         files: