Fix AKS failure (#234)

* Fix AKS failure Signed-off-by: Parthvi Vala <parthvi.vala@suse.com> * Requested changes Co-authored-by: Parthvi Vala <parthvi.vala@suse.com> Co-authored-by: Chandan Pinjani <chandan.pinjani@suse.com> Signed-off-by: Parthvi Vala <parthvi.vala@suse.com> * Reset timeout; did not seem to fix the test Signed-off-by: Parthvi Vala <parthvi.vala@suse.com> --------- Signed-off-by: Parthvi Vala <parthvi.vala@suse.com> Co-authored-by: Chandan Pinjani <chandan.pinjani@suse.com>
rancher · Jan 9, 2025 · a044952 · a044952
1 parent 6a72c34
commit a044952
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 10 deletions.
diff --git a/hosted/aks/helper/helper_cluster.go b/hosted/aks/helper/helper_cluster.go
@@ -463,13 +463,9 @@ func UpdateCluster(cluster *management.Cluster, client *rancher.Client, updateFu
 // ====================================================================Azure CLI (start)=================================
 // Create Azure AKS cluster using AZ CLI
 func CreateAKSClusterOnAzure(location string, clusterName string, k8sVersion string, nodes string, tags map[string]string, extraArgs ...string) error {
-	fmt.Println("Creating AKS resource group ...")
-	rgargs := []string{"group", "create", "--location", location, "--resource-group", clusterName, "--subscription", subscriptionID}
-	fmt.Printf("Running command: az %v\n", rgargs)
-
-	out, err := proc.RunW("az", rgargs...)
+	err := CreateAKSRGOnAzure(clusterName, location)
 	if err != nil {
-		return errors.Wrap(err, "Failed to create cluster: "+out)
+		return err
 	}
 
 	fmt.Println("Creating AKS cluster ...")
@@ -486,6 +482,7 @@ func CreateAKSClusterOnAzure(location string, clusterName string, k8sVersion str
 	}
 
 	fmt.Printf("Running command: az %v\n", args)
+	var out string
 	out, err = proc.RunW("az", args...)
 	if err != nil {
 		return errors.Wrap(err, "Failed to create cluster: "+out)
@@ -496,6 +493,20 @@ func CreateAKSClusterOnAzure(location string, clusterName string, k8sVersion str
 	return nil
 }
 
+// CreateAKSRGOnAzure creates resource group on azure via CLI
+func CreateAKSRGOnAzure(name, location string) error {
+	fmt.Println("Creating AKS resource group ...")
+	rgargs := []string{"group", "create", "--location", location, "--resource-group", name, "--subscription", subscriptionID}
+	fmt.Printf("Running command: az %v\n", rgargs)
+
+	out, err := proc.RunW("az", rgargs...)
+	if err != nil {
+		return errors.Wrap(err, "Failed to create resource group: "+out)
+	}
+	fmt.Println("Created AKS resource group: ", name)
+	return nil
+}
+
 // AddNodePoolOnAzure adds nodepool to an AKS cluster via CLI; helpful when creating a cluster with multiple nodepools
 func AddNodePoolOnAzure(npName, clusterName, resourceGroupName, nodeCount string, extraArgs ...string) error {
 	fmt.Println("Adding node pool ...")

diff --git a/hosted/aks/p1/p1_import_test.go b/hosted/aks/p1/p1_import_test.go
@@ -18,6 +18,8 @@ var _ = Describe("P1Import", func() {
 		k8sVersion string
 	)
 	BeforeEach(func() {
+		GinkgoLogr.Info(fmt.Sprintf("Running on process: %d", GinkgoParallelProcess()))
+
 		var err error
 		k8sVersion, err = helper.GetK8sVersion(ctx.RancherAdminClient, ctx.CloudCredID, location, false)
 		Expect(err).NotTo(HaveOccurred())
@@ -27,6 +29,7 @@ var _ = Describe("P1Import", func() {
 	AfterEach(func() {
 		if ctx.ClusterCleanup {
 			if cluster != nil && cluster.ID != "" {
+				GinkgoLogr.Info(fmt.Sprintf("Cleaning up resource cluster: %s %s", cluster.Name, cluster.ID))
 				err := helper.DeleteAKSHostCluster(cluster, ctx.RancherAdminClient)
 				Expect(err).To(BeNil())
 			}

diff --git a/hosted/aks/p1/p1_provisioning_test.go b/hosted/aks/p1/p1_provisioning_test.go
@@ -25,14 +25,18 @@ import (
 var _ = Describe("P1Provisioning", func() {
 	var cluster *management.Cluster
 	var k8sVersion string
+
 	BeforeEach(func() {
+		GinkgoLogr.Info(fmt.Sprintf("Running on process: %d", GinkgoParallelProcess()))
 		var err error
 		k8sVersion, err = helper.GetK8sVersion(ctx.RancherAdminClient, ctx.CloudCredID, location, false)
 		Expect(err).NotTo(HaveOccurred())
 		GinkgoLogr.Info(fmt.Sprintf("Using K8s version %s for cluster %s", k8sVersion, clusterName))
 	})
+
 	AfterEach(func() {
 		if ctx.ClusterCleanup && (cluster != nil && cluster.ID != "") {
+			GinkgoLogr.Info(fmt.Sprintf("Cleaning up resource cluster: %s %s", cluster.Name, cluster.ID))
 			err := helper.DeleteAKSHostCluster(cluster, ctx.RancherAdminClient)
 			Expect(err).To(BeNil())
 		} else {
@@ -461,8 +465,21 @@ var _ = Describe("P1Provisioning", func() {
 
 	// Refer: https://github.com/rancher/hosted-providers-e2e/issues/192
 	It("should successfully create 2 clusters in the same RG", func() {
-		testCaseID = 217
+		testCaseID = 214
+
+		// Setting this to nil ensures we do not use the `cluster` variable value from another test running in parallel with this one.
+		cluster = nil
+
+		// Create the resource group via CLI
 		rgName := namegen.AppendRandomString(helpers.ClusterNamePrefix + "-custom-rg")
+		err := helper.CreateAKSRGOnAzure(rgName, location)
+		Expect(err).To(BeNil())
+		defer func() {
+			// This is to delete the resource group
+			err = helper.DeleteAKSClusteronAzure(rgName)
+			Expect(err).To(BeNil())
+		}()
+
 		updateFunc := func(aksConfig *aks.ClusterConfig) {
 			aksConfig.ResourceGroup = rgName
 		}
@@ -488,9 +505,6 @@ var _ = Describe("P1Provisioning", func() {
 			}()
 		}
 		wg.Wait()
-		// This is to delete the resource group
-		err := helper.DeleteAKSClusteronAzure(rgName)
-		Expect(err).To(BeNil())
 	})
 
 	When("a cluster is created for upgrade", func() {