diff --git a/test/e2e/clusterctl_upgrade_test.go b/test/e2e/clusterctl_upgrade_test.go index bd3ef5bf53..a68b48ee7a 100644 --- a/test/e2e/clusterctl_upgrade_test.go +++ b/test/e2e/clusterctl_upgrade_test.go @@ -18,9 +18,11 @@ package e2e import ( "context" + "os" . "github.com/onsi/ginkgo/v2" capi_e2e "sigs.k8s.io/cluster-api/test/e2e" + "sigs.k8s.io/cluster-api/test/framework" ) var _ = Describe("Upgrading cluster from CAPV 1.8.X to main using clusterctl [PR-Blocking]", func() { @@ -33,15 +35,18 @@ var _ = Describe("Upgrading cluster from CAPV 1.8.X to main using clusterctl [P SkipCleanup: skipCleanup, InitWithProvidersContract: "v1beta1", MgmtFlavor: "remote-management", - InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0-rc.0/clusterctl-{OS}-{ARCH}", - InitWithCoreProvider: "cluster-api:v1.6.0-rc.0", - InitWithBootstrapProviders: []string{"kubeadm:v1.6.0-rc.0"}, - InitWithControlPlaneProviders: []string{"kubeadm:v1.6.0-rc.0"}, + 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"}, InitWithInfrastructureProviders: []string{"vsphere:v1.8.4"}, InitWithRuntimeExtensionProviders: []string{}, InitWithKubernetesVersion: "v1.28.0", WorkloadKubernetesVersion: "v1.28.0", - WorkloadFlavor: "workload", + WorkloadFlavor: "", + PreInit: func(managementClusterProxy framework.ClusterProxy) { + os.Setenv("CONTROL_PLANE_ENDPOINT_IP", os.Getenv("WORKLOAD_CONTROL_PLANE_ENDPOINT_IP")) + }, } }) }) diff --git a/test/e2e/config/vsphere-ci.yaml b/test/e2e/config/vsphere-ci.yaml index c35d4d14f1..4509c2faeb 100644 --- a/test/e2e/config/vsphere-ci.yaml +++ b/test/e2e/config/vsphere-ci.yaml @@ -38,6 +38,16 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" + - name: v1.5.3 + # Use manifest from source files + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/core-components.yaml" + type: "url" + contract: v1beta1 + files: + - sourcePath: "../data/shared/main/v1beta1/metadata.yaml" + replacements: + - old: "imagePullPolicy: Always" + new: "imagePullPolicy: IfNotPresent" - name: kubeadm type: BootstrapProvider @@ -52,6 +62,16 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" + - name: v1.5.3 + # Use manifest from source files + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/bootstrap-components.yaml" + type: "url" + contract: v1beta1 + files: + - sourcePath: "../data/shared/main/v1beta1/metadata.yaml" + replacements: + - old: "imagePullPolicy: Always" + new: "imagePullPolicy: IfNotPresent" - name: kubeadm type: ControlPlaneProvider @@ -66,6 +86,16 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" + - name: v1.5.3 + # Use manifest from source files + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/control-plane-components.yaml" + type: "url" + contract: v1beta1 + files: + - sourcePath: "../data/shared/main/v1beta1/metadata.yaml" + replacements: + - old: "imagePullPolicy: Always" + new: "imagePullPolicy: IfNotPresent" - name: vsphere type: InfrastructureProvider diff --git a/test/e2e/config/vsphere-dev.yaml b/test/e2e/config/vsphere-dev.yaml index 4efbe73dab..70c7200541 100644 --- a/test/e2e/config/vsphere-dev.yaml +++ b/test/e2e/config/vsphere-dev.yaml @@ -41,6 +41,16 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" + - name: v1.5.3 + # Use manifest from source files + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/core-components.yaml" + type: "url" + contract: v1beta1 + files: + - sourcePath: "../data/shared/main/v1beta1/metadata.yaml" + replacements: + - old: "imagePullPolicy: Always" + new: "imagePullPolicy: IfNotPresent" - name: kubeadm type: BootstrapProvider @@ -55,6 +65,16 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" + - name: v1.5.3 + # Use manifest from source files + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/bootstrap-components.yaml" + type: "url" + contract: v1beta1 + files: + - sourcePath: "../data/shared/main/v1beta1/metadata.yaml" + replacements: + - old: "imagePullPolicy: Always" + new: "imagePullPolicy: IfNotPresent" - name: kubeadm type: ControlPlaneProvider @@ -69,6 +89,16 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" + - name: v1.5.3 + # Use manifest from source files + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/control-plane-components.yaml" + type: "url" + contract: v1beta1 + files: + - sourcePath: "../data/shared/main/v1beta1/metadata.yaml" + replacements: + - old: "imagePullPolicy: Always" + new: "imagePullPolicy: IfNotPresent" - name: vsphere type: InfrastructureProvider