Merge pull request #3075 from jackfrancis/e2e-common-cluster-identity-secret

E2E: use a common cluster-identity-secret

Author: k8s-ci-robot

test/e2e/azure_test.go

@@ -84,31 +84,33 @@ var _ = Describe("Workload cluster creation", func() {
 		secret := &corev1.Secret{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "cluster-identity-secret",
-				Namespace: namespace.Name,
+				Namespace: defaultNamespace,
 				Labels: map[string]string{
 					clusterctlv1.ClusterctlMoveHierarchyLabelName: "true",
 				},
 			},
 			Type: corev1.SecretTypeOpaque,
 			Data: map[string][]byte{"clientSecret": []byte(spClientSecret)},
 		}
-		_, err = bootstrapClusterProxy.GetClientSet().CoreV1().Secrets(namespace.Name).Get(ctx, secret.Name, metav1.GetOptions{})
+		_, err = bootstrapClusterProxy.GetClientSet().CoreV1().Secrets(defaultNamespace).Get(ctx, secret.Name, metav1.GetOptions{})
 		if err != nil && !apierrors.IsNotFound(err) {
 			Expect(err).ShouldNot(HaveOccurred())
 		}
 		if err != nil {
 			Logf("Creating cluster identity secret \"%s\"", secret.Name)
 			err = bootstrapClusterProxy.GetClient().Create(ctx, secret)
-			Expect(err).NotTo(HaveOccurred())
+			if !apierrors.IsAlreadyExists(err) {
+				Expect(err).NotTo(HaveOccurred())
+			}
 		} else {
 			Logf("Using existing cluster identity secret")
 		}
 
 		identityName := e2eConfig.GetVariable(ClusterIdentityName)
 		Expect(os.Setenv(ClusterIdentityName, identityName)).To(Succeed())
-		Expect(os.Setenv(ClusterIdentityNamespace, namespace.Name)).To(Succeed())
+		Expect(os.Setenv(ClusterIdentityNamespace, defaultNamespace)).To(Succeed())
 		Expect(os.Setenv(ClusterIdentitySecretName, "cluster-identity-secret")).To(Succeed())
-		Expect(os.Setenv(ClusterIdentitySecretNamespace, namespace.Name)).To(Succeed())
+		Expect(os.Setenv(ClusterIdentitySecretNamespace, defaultNamespace)).To(Succeed())
 		additionalCleanup = nil
 	})
 

test/e2e/cloud-provider-azure.go

@@ -36,7 +36,6 @@ const (
 	azureDiskCSIDriverHelmRepoURL     = "https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts"
 	azureDiskCSIDriverChartName       = "azuredisk-csi-driver"
 	azureDiskCSIDriverHelmReleaseName = "azuredisk-csi-driver-oot"
-	defaultNamespace                  = "default"
 )
 
 // InstallCalicoAndCloudProviderAzureHelmChart installs the official cloud-provider-azure helm chart

test/e2e/common.go

@@ -85,6 +85,7 @@ const (
 	capiWindowsOfferName            = "capi-windows"
 	aksClusterNameSuffix            = "aks"
 	flatcarCAPICommunityGallery     = "flatcar4capi-742ef0cb-dcaa-4ecb-9cb0-bfd2e43dccc0"
+	defaultNamespace                = "default"
 )
 
 func Byf(format string, a ...interface{}) {