🐛 fix e2e with webhook

Signed-off-by: Alexander Eldeib <[email protected]>

Author: alexeldeib

test/e2e/azure_suite_test.go

@@ -144,6 +144,7 @@ var _ = AfterSuite(func() {
 	// DO NOT stream "capi-controller-manager" logs as it prints out azure.json
 	Expect(writeLogs(mgmt, "capi-kubeadm-bootstrap-system", "capi-kubeadm-bootstrap-controller-manager", logPath)).To(Succeed())
 	Expect(writeLogs(mgmt, "capz-system", "capz-controller-manager", logPath)).To(Succeed())
+	Expect(writeLogs(mgmt, "capi-webhook-system", "capz-controller-manager", logPath)).To(Succeed())
 	By("Tearing down management cluster")
 	mgmt.Teardown(ctx)
 })

test/e2e/azure_test.go

@@ -51,7 +51,6 @@ var _ = Describe("CAPZ e2e tests", func() {
 			nodeGen = &NodeGenerator{}
 			clusterGen.VariablesInit()
 			machineDeploymentGen = &MachineDeploymentGenerator{}
-			cluster, infraCluster = clusterGen.GenerateCluster(namespace)
 		})
 
 		AfterEach(func() {
@@ -61,6 +60,7 @@ var _ = Describe("CAPZ e2e tests", func() {
 
 		Context("Create single controlplane cluster", func() {
 			It("Should create a single node cluster", func() {
+				cluster, infraCluster = clusterGen.GenerateCluster(creds.SubscriptionID, namespace)
 				controlplane := nodeGen.GenerateKubeadmControlplane(creds, cluster.GetName(), 1)
 				machineTemplate := nodeGen.GenerateMachineTemplate(creds, cluster.GetName())
 				input = &ControlPlaneClusterInput{
@@ -77,6 +77,7 @@ var _ = Describe("CAPZ e2e tests", func() {
 
 		Context("Create multiple controlplane cluster with machine deployments", func() {
 			It("Should create a 3 node cluster", func() {
+				cluster, infraCluster = clusterGen.GenerateCluster(creds.SubscriptionID, namespace)
 				controlplane := nodeGen.GenerateKubeadmControlplane(creds, cluster.GetName(), 3)
 				machineTemplate := nodeGen.GenerateMachineTemplate(creds, cluster.GetName())
 				machineDeployment := machineDeploymentGen.Generate(creds, cluster.GetNamespace(), cluster.GetName(), 1)

test/e2e/resource_generators.go

@@ -117,7 +117,7 @@ func (c *ClusterGenerator) VariablesInit() {
 	imageVersion = v.GetString("imageVersion")
 }
 
-func (c *ClusterGenerator) GenerateCluster(namespace string) (*capiv1.Cluster, *infrav1.AzureCluster) {
+func (c *ClusterGenerator) GenerateCluster(subscriptionId, namespace string) (*capiv1.Cluster, *infrav1.AzureCluster) {
 	name := "capz-e2e" + util.RandomString(6)
 	vnetName := name + "-vnet"
 	tags := map[string]string{
@@ -130,8 +130,9 @@ func (c *ClusterGenerator) GenerateCluster(namespace string) (*capiv1.Cluster, *
 			Name:      name,
 		},
 		Spec: infrav1.AzureClusterSpec{
-			Location:      location,
-			ResourceGroup: name,
+			Location:       location,
+			ResourceGroup:  name,
+			SubscriptionID: subscriptionId,
 			NetworkSpec: infrav1.NetworkSpec{
 				Vnet: infrav1.VnetSpec{Name: vnetName},
 			},