Cleanup

kubernetes-sigs · Sep 13, 2024 · 8592922 · 8592922
1 parent b32063f
commit 8592922
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -222,8 +222,6 @@ require (
 
 replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.3
 
-// replace sigs.k8s.io/cluster-api/test => github.com/willie-yao/cluster-api/test v0.0.0-20240911215540-880e54c8c481
-
 replace (
 	github.com/google/cel-go => github.com/google/cel-go v0.17.8
 	github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.18.0

diff --git a/test/e2e/capi_test.go b/test/e2e/capi_test.go
@@ -201,12 +201,13 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
 				os.Setenv("AZURE_CLIENT_ID_CLOUD_PROVIDER", *identity.Properties.ClientID)
 			})
 
+			// TODO: Uncomment this test once the old CAPI upgrade version is > 1.15 since 1.15 CI is broken from workload identity migration.
 			// Context("upgrade from an old version of v1beta1 to current, and scale workload clusters created in the old version", func() {
 			// 	capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
 			// 		return capi_e2e.ClusterctlUpgradeSpecInput{
-			// 			E2EConfig:                 e2eConfig,
-			// 			ClusterctlConfigPath:      clusterctlConfigPath,
-			// 			BootstrapClusterProxy:     bootstrapClusterProxy,
+			// 			E2EConfig:                 e2eConfig,igPath,
+			// 			BootstrapClusterProxy:     bootstrapCl
+			// 			ClusterctlConfigPath:      clusterctlConfusterProxy,
 			// 			ArtifactFolder:            artifactFolder,
 			// 			SkipCleanup:               skipCleanup,
 			// 			PreInit:                   getPreInitFunc(ctx),
@@ -221,10 +222,8 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
 			// 			InitWithControlPlaneProviders:   []string{"kubeadm:" + e2eConfig.GetVariable(OldCAPIUpgradeVersion)},
 			// 			InitWithInfrastructureProviders: []string{"azure:" + e2eConfig.GetVariable(OldProviderUpgradeVersion)},
 			// 			InitWithAddonProviders:          []string{"helm:" + e2eConfig.GetVariable(OldAddonProviderUpgradeVersion)},
-			// 			WorkloadKubernetesVersion:       e2eConfig.GetVariable(KubernetesVersionAPIUpgradeFrom),
 			// 		}
 			// 	})
-			// })
 
 			Context("upgrade from the latest version of v1beta1 to current, and scale workload clusters created in the old version", func() {
 				capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
@@ -246,7 +245,6 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
 						InitWithControlPlaneProviders:   []string{"kubeadm:" + e2eConfig.GetVariable(LatestCAPIUpgradeVersion)},
 						InitWithInfrastructureProviders: []string{"azure:" + e2eConfig.GetVariable(LatestProviderUpgradeVersion)},
 						InitWithAddonProviders:          []string{"helm:" + e2eConfig.GetVariable(LatestAddonProviderUpgradeVersion)},
-						WorkloadKubernetesVersion:       e2eConfig.GetVariable(KubernetesVersionAPIUpgradeFrom),
 					}
 				})
 			})