Merge pull request #3366 from josh-ferrell/e2e_extinfra_merge

Merge external infrastructure, peered VPCs, internal ELB and private subnets E2E test.

Author: k8s-ci-robot

test/e2e/data/e2e_conf.yaml

@@ -226,8 +226,6 @@ providers:
           - sourcePath: "./infrastructure-aws/generated/cluster-template.yaml"
           - sourcePath: "./infrastructure-aws/generated/cluster-template-gpu.yaml"
           - sourcePath: "./infrastructure-aws/generated/cluster-template-upgrades.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-external-infrastructure.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-external-securitygroups.yaml"
           - sourcePath: "./infrastructure-aws/generated/cluster-template-peered-remote.yaml"
           - sourcePath: "./infrastructure-aws/generated/cluster-template-internal-elb.yaml"
           - sourcePath: "./infrastructure-aws/kustomize_sources/topology/clusterclass-quick-start.yaml"

test/e2e/data/infrastructure-aws/kustomize_sources/external-infrastructure/kustomization.yaml

@@ -16,5 +16,3 @@ spec:
     spec:
       failureDomain: "us-west-2a"
 
-
-

test/e2e/data/infrastructure-aws/kustomize_sources/external-infrastructure/patches/external-infrastructure.yaml

@@ -3,4 +3,5 @@ resources:
 patchesStrategicMerge:
   - patches/management.yaml
   - patches/az-select.yaml
+  - patches/external-securitygroups.yaml
 

test/e2e/data/infrastructure-aws/kustomize_sources/external-securitygroups/kustomization.yaml

@@ -17,4 +17,3 @@ spec:
       failureDomain: "us-west-2a"
 
 
-

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

@@ -5,8 +5,9 @@ metadata:
 spec:
   network:
     securityGroupOverrides:
-      controlplane: "${CP_SG_ID}"
-      apiserver-lb: "${API_SG_ID}"
-      node: "${NODE_SG_ID}"
-      lb: "${LB_SG_ID}"
-      
+      controlplane: "${SG_ID}"
+      apiserver-lb: "${SG_ID}"
+      node: "${SG_ID}"
+      lb: "${SG_ID}"
+      bastion: ${SG_ID}
+