Merge pull request #3311 from josh-ferrell/e2e_fix_intelb_az

Add specific AZ to peered VPC and  ELB test

Author: k8s-ci-robot

test/e2e/data/infrastructure-aws/kustomize_sources/internal-elb/kustomization.yaml

@@ -2,4 +2,5 @@ resources:
   - ../remote-management-cluster
 patchesStrategicMerge:
   - patches/internal-elb.yaml
+  - patches/az-select.yaml
 

test/e2e/data/infrastructure-aws/kustomize_sources/internal-elb/patches/az-select.yaml

@@ -0,0 +1,10 @@
+kind: AWSMachineTemplate
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+metadata:
+  name: "${CLUSTER_NAME}-control-plane"
+spec:
+  template:
+    spec:
+      failureDomain: "us-west-2a"
+
+

test/e2e/data/infrastructure-aws/kustomize_sources/peered-remote/kustomization.yaml

@@ -2,4 +2,5 @@ resources:
   - ../remote-management-cluster
 patchesStrategicMerge:
   - patches/management.yaml
+  - patches/az-select.yaml
 

test/e2e/data/infrastructure-aws/kustomize_sources/peered-remote/patches/az-select.yaml

@@ -0,0 +1,9 @@
+kind: AWSMachineTemplate
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+metadata:
+  name: "${CLUSTER_NAME}-control-plane"
+spec:
+  template:
+    spec:
+      failureDomain: "us-west-2a"
+

test/e2e/suites/unmanaged/unmanaged_functional_test.go

@@ -835,6 +835,7 @@ var _ = ginkgo.Context("[unmanaged] [functional]", func() {
 				VpcCidr:           "10.0.0.0/23",
 				PublicSubnetCidr:  "10.0.0.0/24",
 				PrivateSubnetCidr: "10.0.1.0/24",
+				AvailabilityZone:  "us-west-2a",
 			}, e2eCtx)
 			mgmtClusterInfra.CreateInfrastructure()
 			Expect(mgmtClusterInfra.VPC).NotTo(BeNil())
@@ -853,6 +854,7 @@ var _ = ginkgo.Context("[unmanaged] [functional]", func() {
 				VpcCidr:           "10.0.2.0/23",
 				PublicSubnetCidr:  "10.0.2.0/24",
 				PrivateSubnetCidr: "10.0.3.0/24",
+				AvailabilityZone:  "us-west-2a",
 			}, e2eCtx)
 			wlClusterInfra.CreateInfrastructure()
 			Expect(wlClusterInfra.VPC).NotTo(BeNil())