From 3bdf24f6c39e12ead0bdc245835be6ebe7488cbe Mon Sep 17 00:00:00 2001
From: Bryce Soghigian <bsoghigian@gmail.com>
Date: Mon, 10 Feb 2025 14:50:38 -0800
Subject: [PATCH] fix: constructing mc rg

---
 .github/readme.md                         |  0
 .github/workflows/e2e.yaml                |  2 +-
 Makefile                                  |  2 +-
 test/pkg/environment/azure/environment.go | 14 +++++++++-----
 4 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 .github/readme.md

diff --git a/.github/readme.md b/.github/readme.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index b8ee8956d..9de7ac0a7 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -158,7 +158,7 @@ jobs:
         if: inputs.suite != 'Nonbehavioral'
         run: |
           AZURE_CLUSTER_NAME=${{ env.CLUSTER_NAME }} AZURE_RESOURCE_GROUP=${{ env.RG_NAME }} make az-creds
-          AZURE_SUBSCRIPTION_ID=${{ secrets.E2E_SUBSCRIPTION_ID }} AZURE_RESOURCE_GROUP_MC=MC_${{ env.RG_NAME }}_${{ env.CLUSTER_NAME }}_${{ inputs.location }} CLUSTER_NAME=${{ env.CLUSTER_NAME }} AZURE_ACR_NAME=${{ env.ACR_NAME}} TEST_SUITE="${{ inputs.suite }}" GIT_REF="$(git rev-parse HEAD)" make e2etests
+          AZURE_SUBSCRIPTION_ID=${{ secrets.E2E_SUBSCRIPTION_ID }} AZURE_RESOURCE_GROUP=${{ env.RG_NAME }} CLUSTER_NAME=${{ env.CLUSTER_NAME }} AZURE_ACR_NAME=${{ env.ACR_NAME}} TEST_SUITE="${{ inputs.suite }}" GIT_REF="$(git rev-parse HEAD)" make e2etests
       - name: dump logs on failure
         uses: ./.github/actions/e2e/dump-logs
         if: failure() || cancelled()
diff --git a/Makefile b/Makefile
index 18b21a1c3..d24c7aa40 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ e2etests: ## Run the e2e suite against your local cluster
 	# -count 1: prevents caching
 	# -timeout: If a test binary runs longer than TEST_TIMEOUT, panic
 	# -v: verbose output
-	cd test && CLUSTER_NAME=${CLUSTER_NAME} AZURE_ACR_NAME=${AZURE_ACR_NAME} AZURE_RESOURCE_GROUP_MC=${AZURE_RESOURCE_GROUP_MC} AZURE_SUBSCRIPTION_ID=${AZURE_SUBSCRIPTION_ID} AZURE_LOCATION=${AZURE_LOCATION} go test \
+	cd test && CLUSTER_NAME=${CLUSTER_NAME} AZURE_ACR_NAME=${AZURE_ACR_NAME} AZURE_RESOURCE_GROUP=${AZURE_RESOURCE_GROUP} AZURE_SUBSCRIPTION_ID=${AZURE_SUBSCRIPTION_ID} AZURE_LOCATION=${AZURE_LOCATION} go test \
 		-p 1 \
 		-count 1 \
 		-timeout ${TEST_TIMEOUT} \
diff --git a/test/pkg/environment/azure/environment.go b/test/pkg/environment/azure/environment.go
index de0739851..a8b9e83a0 100644
--- a/test/pkg/environment/azure/environment.go
+++ b/test/pkg/environment/azure/environment.go
@@ -17,6 +17,7 @@ limitations under the License.
 package azure
 
 import (
+	"fmt"
 	"os"
 	"testing"
 
@@ -54,6 +55,7 @@ type Vars struct {
 	VNETResourceGroup string
 	ACRName           string
 	ClusterName       string
+	ClusterResourceGroup string
 }
 type AzureClients struct {
 	VNETClient       *armnetwork.VirtualNetworksClient
@@ -65,16 +67,18 @@ func NewEnvironment(t *testing.T) *Environment {
 	azureEnv := &Environment{
 		Environment: env,
 	}
-	azureEnv.NodeResourceGroup = os.Getenv("AZURE_RESOURCE_GROUP_MC")
+	azureEnv.ClusterName = os.Getenv("AZURE_CLUSTER_NAME")
+	azureEnv.ClusterResourceGroup = os.Getenv("AZURE_RESOURCE_GROUP")
+	azureEnv.ACRName = os.Getenv("ACR_NAME")
+	azureEnv.Region = os.Getenv("AZURE_LOCATION")
+
+	azureEnv.NodeResourceGroup = fmt.Sprintf("MC_%s_%s_%s", azureEnv.ClusterResourceGroup, azureEnv.ClusterName, azureEnv.Region) 
 	azureEnv.SubscriptionID = os.Getenv("AZURE_SUBSCRIPTION_ID")
 	azureEnv.VNETResourceGroup = os.Getenv("VNET_RESOURCE_GROUP")
 	if azureEnv.VNETResourceGroup == "" {
 		azureEnv.VNETResourceGroup = azureEnv.NodeResourceGroup
 	}
-	azureEnv.ClusterName = os.Getenv("AZURE_CLUSTER_NAME")
-	azureEnv.ACRName = os.Getenv("ACR_NAME")
-	azureEnv.Region = os.Getenv("AZURE_LOCATION")
-
+	
 	cred, err := azidentity.NewDefaultAzureCredential(nil)
 	if err != nil {
 		panic(err)