wip of running e2e tests locally 2

Author: nawazkh

Makefile

@@ -728,6 +728,8 @@ kind-create-bootstrap: $(KUBECTL) ## Create capz kind bootstrap cluster.
 	if [ "$(MGMT_CLUSTER_TYPE)" == "aks" ]; then \
 		MGMT_CLUSTER_NAME=capz-e2e \
 		AKS_RESOURCE_GROUP=capz-e2e \
+		AKS_MGMT_VNET_NAME=capz-e2e-mgmt-vnet \
+		AKS_MGMT_SUBNET_NAME=capz-e2e-mgmt-subnet \
 		./scripts/aks-as-mgmt.sh; \
 	else \
 		KIND_CLUSTER_NAME=capz-e2e ./scripts/kind-with-registry.sh; \

e2e.mk

@@ -6,7 +6,8 @@
 ##@ E2E Testing:
 .PHONY: test-e2e-run
 test-e2e-run: generate-e2e-templates install-tools kind-create-bootstrap ## Run e2e tests.
-	@$(ENVSUBST) < $(E2E_CONF_FILE) > $(E2E_CONF_FILE_ENVSUBST) && \
+	@source ./scripts/peer-vnets.sh && source_tilt_settings tilt-settings.yaml; \
+	$(ENVSUBST) < $(E2E_CONF_FILE) > $(E2E_CONF_FILE_ENVSUBST) && \
 	if [ -z "${AZURE_CLIENT_ID_USER_ASSIGNED_IDENTITY}" ]; then \
 		export AZURE_CLIENT_ID_USER_ASSIGNED_IDENTITY=$(shell cat $(AZURE_IDENTITY_ID_FILEPATH)); \
 	fi; \

scripts/peer-vnets.sh

@@ -20,9 +20,22 @@ set -o pipefail # make the pipeline fail if any command in it fails.
 REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 source_tilt_settings() {
-  if [ "$#" -ne 1 ]; then
-    echo "Usage: $0 <tilt-settings.yaml>"
-    exit 1
+
+  found=false
+  # echo "checking for tilt-settings.yaml..."
+  # echo "args: $@"
+  for arg in "$@"; do
+      if [ "$arg" == "tilt-settings.yaml" ]; then
+          found=true
+          break
+      fi
+  done
+
+  if [ "$found" == true ]; then
+      echo "tilt-settings.yaml was passed as an argument."
+  else
+      echo "tilt-settings.yaml was not found."
+      exit 1
   fi
 
   TILT_SETTINGS_FILE="$1"
@@ -33,18 +46,18 @@ source_tilt_settings() {
     exit 1
   fi
 
-  echo "Reading variables from $TILT_SETTINGS_FILE under 'kustomize_substition'..."
+  echo "Reading variables from $TILT_SETTINGS_FILE under 'kustomize_substitutions'..."
 
-  # Get the list of keys under kustomize_substition
-  VAR_KEYS=$(yq e '.kustomize_substition | keys | .[]' "$TILT_SETTINGS_FILE" 2>/dev/null || true)
+  # Get the list of keys under kustomize_substitutions
+  VAR_KEYS=$(yq e '.kustomize_substitutions | keys | .[]' "$TILT_SETTINGS_FILE" 2>/dev/null || true)
 
   # If there's no such key or it's empty, VAR_KEYS will be empty
   if [ -z "$VAR_KEYS" ]; then
-    echo "No variables found under 'kustomize_substition'."
+    echo "No variables found under 'kustomize_substitutions'."
   else
     for key in $VAR_KEYS; do
       # Read the value of each key
-      value=$(yq e ".kustomize_substition[\"$key\"]" "$TILT_SETTINGS_FILE")
+      value=$(yq e ".kustomize_substitutions[\"$key\"]" "$TILT_SETTINGS_FILE")
       # Export the key/value pair
       export "$key=$value"
       echo "Exported $key=$value"

test/e2e/azure_apiserver_ilb.go

@@ -464,5 +464,6 @@ func AzureAPIServerILBSpec(ctx context.Context, inputGetter func() AzureAPIServe
 }
 
 func PeerVnets(ctx context.Context, inputGetter func() AzureAPIServerILBSpecInput) {
-
+	// TODO: shall I have this shell commands in this func instead ?
+	Logf("In PeerVnets func")
 }

test/e2e/azure_test.go

@@ -1180,11 +1180,6 @@ var _ = Describe("Workload cluster creation", func() {
 						}
 					})
 				}),
-				withPreWaitForCluster(func() {
-					// TODO: only invoke this in local runs
-					// Peer VNets of the mgmt cluster and workload cluster
-
-				}),
 			), result)
 
 			By("Probing workload cluster with APIServerILB feature gate", func() {
@@ -1236,6 +1231,20 @@ var _ = Describe("Workload cluster creation", func() {
 						}
 					})
 				}),
+				withPreWaitForCluster(func() {
+					// TODO: only invoke this in local runs
+					// Peer VNets of the mgmt cluster and workload cluster
+					PeerVnets(ctx, func() AzureAPIServerILBSpecInput {
+						return AzureAPIServerILBSpecInput{
+							BootstrapClusterProxy:                   bootstrapClusterProxy,
+							Cluster:                                 result.Cluster,
+							Namespace:                               namespace,
+							ClusterName:                             clusterName,
+							WaitIntervals:                           e2eConfig.GetIntervals(specName, "wait-worker-nodes"),
+							TemplateHasPrivateIPCustomDNSResolution: true,
+						}
+					})
+				}),
 			), result)
 
 			By("Probing workload cluster with APIServerILB feature gate", func() {

test/e2e/config/azure-dev.yaml

@@ -228,7 +228,7 @@ variables:
   IP_FAMILY: "IPv4"
   CLUSTER_IDENTITY_NAME: "${CLUSTER_IDENTITY_NAME:-cluster-identity-ci}"
   ASO_CREDENTIAL_SECRET_NAME: "${ASO_CREDENTIAL_SECRET_NAME:-aso-credentials}"
-  ASO_CREDENTIAL_SECRET_MODE: "${ASO_CREDENTIAL_SECRET_MODE:-workloadidentity}
+  ASO_CREDENTIAL_SECRET_MODE: "${ASO_CREDENTIAL_SECRET_MODE:-workloadidentity}"
   NODE_DRAIN_TIMEOUT: "60s"
   CI_VERSION: ""
   KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"