wip of running e2e tests locally 6

Author: nawazkh

Makefile

@@ -726,10 +726,10 @@ test-cover: test ## Run tests with code coverage and generate reports.
 .PHONY: create-bootstrap
 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 \
+		MGMT_CLUSTER_NAME=capz-e2e-4 \
+		AKS_RESOURCE_GROUP=capz-e2e-4 \
+		AKS_MGMT_VNET_NAME=capz-e2e-4-mgmt-vnet \
+		AKS_MGMT_SUBNET_NAME=capz-e2e-4-mgmt-subnet \
 		./scripts/aks-as-mgmt.sh; \
 	else \
 		KIND_CLUSTER_NAME=capz-e2e ./scripts/kind-with-registry.sh; \

templates/test/ci/prow-apiserver-ilb/kustomization.yaml

@@ -21,7 +21,7 @@ patches:
     patch: |-
       - op: replace
         path: /spec/template/spec/preKubeadmCommands/0
-        value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP}   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts
+        value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts
   - target:
       kind: AzureCluster
     patch: |-

test/e2e/azure_apiserver_ilb.go

@@ -88,7 +88,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io"
 	"os"
 	"os/exec"
 	"strings"
@@ -484,22 +483,35 @@ func PeerVnets(ctx context.Context, inputGetter func() AzureAPIServerILBSpecInpu
 	Logf("cmd to be run %v", cmd)
 
 	// ------------------------ //
-	// output, err := cmd.Output()
-	// if err != nil {
-	// 	Logf("Error running peer-vnets.sh: %v", err)
-	// }
-	// Logf("Output of peer-vnets.sh: %v", string(output))
+	var stdoutBuf, stderrBuf bytes.Buffer
+
+	// Capture stdout, stderr separately
+	cmd.Stdout = &stdoutBuf
+	cmd.Stderr = &stderrBuf
+	err := cmd.Run()
+
+	// Convert buffers to string
+	stdoutStr := stdoutBuf.String()
+	stderrStr := stderrBuf.String()
+
+	Logf("Stdout: %s", stdoutStr)
+	Logf("Stderr: %s", stderrStr)
+
+	if err != nil {
+		// Command failed (non-zero exit code or something else)
+		Logf("Error: %v", err)
+	}
 
 	/*
 		// Replace the below block with the above block when debugging the peering VNets script
 		// The below code suppresses the StdOut and StdErr
 	*/
 
-	cmd.Stdout = io.Discard
-	cmd.Stderr = io.Discard
-	err := cmd.Run()
-	if err != nil {
-		Logf("Error running peer-vnets.sh: %v", err)
-	}
+	// cmd.Stdout = io.Discard
+	// cmd.Stderr = io.Discard
+	// err := cmd.Run()
+	// if err != nil {
+	// 	Logf("Error running peer-vnets.sh: %v", err)
+	// }
 	// ------------------------ //
 }

test/e2e/azure_test.go

@@ -1265,7 +1265,7 @@ var _ = Describe("Workload cluster creation", func() {
 		})
 	})
 
-	Context("Local test: Creating a self-managed VM based cluster using API Server ILB feature gate and fully spec-ed out APIServer ILB template [OPTIONAL][API-Server-ILB][LOCAL]", func() {
+	Context("Local test: Creating a self-managed VM based cluster using API Server ILB feature gate and fully spec-ed out APIServer ILB template [OPTIONAL][API-Server-ILB]", func() {
 		It("with three controlplane node and three worker nodes", func() {
 			clusterName = getClusterName(clusterNamePrefix, "apiserver-ilb")
 
@@ -1288,21 +1288,15 @@ var _ = Describe("Workload cluster creation", func() {
 					WaitForControlPlaneInitialized: EnsureControlPlaneInitializedNoAddons,
 				}),
 				withPostMachinesProvisioned(func() {
-					PeerVnets(ctx, func() AzureAPIServerILBSpecInput {
-						return AzureAPIServerILBSpecInput{
-							BootstrapClusterProxy:                   bootstrapClusterProxy,
-							Cluster:                                 result.Cluster,
-							Namespace:                               namespace,
-							ClusterName:                             clusterName,
-							WaitIntervals:                           e2eConfig.GetIntervals(specName, "wait-worker-nodes"),
-							TemplateHasPrivateIPCustomDNSResolution: true,
+					EnsureDaemonsets(ctx, func() DaemonsetsSpecInput {
+						return DaemonsetsSpecInput{
+							BootstrapClusterProxy: bootstrapClusterProxy,
+							Namespace:             namespace,
+							ClusterName:           clusterName,
 						}
 					})
 				}),
 				// withPreWaitForCluster(func() {
-				// 	// TODO: only invoke this in local runs
-				// 	// Peer VNets of the mgmt cluster and workload cluster
-				//
 				// }),
 			), result)
 
@@ -1323,6 +1317,5 @@ var _ = Describe("Workload cluster creation", func() {
 			By("PASSED!")
 		})
 	})
-
 	// TODO: add a same test as above for a windows cluster
 })