Merge pull request #3285 from josh-ferrell/e2e_internal_elb_peering

Adds an E2E test for using peered VPCs and an internal ELB
kubernetes-sigs · Mar 10, 2022 · c64de9a · c64de9a
2 parents 40cf298 + 0659828
commit c64de9a
Show file tree

Hide file tree

Showing 7 changed files with 559 additions and 7 deletions.
diff --git a/test/e2e/data/e2e_conf.yaml b/test/e2e/data/e2e_conf.yaml
@@ -226,6 +226,8 @@ providers:
           - 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"
           - sourcePath: "./shared/v1beta1_provider/metadata.yaml"
         replacements:

diff --git a/test/e2e/data/infrastructure-aws/kustomize_sources/internal-elb/kustomization.yaml b/test/e2e/data/infrastructure-aws/kustomize_sources/internal-elb/kustomization.yaml
@@ -0,0 +1,5 @@
+resources:
+  - ../remote-management-cluster
+patchesStrategicMerge:
+  - patches/internal-elb.yaml
+
diff --git a/test/e2e/data/infrastructure-aws/kustomize_sources/internal-elb/patches/internal-elb.yaml b/test/e2e/data/infrastructure-aws/kustomize_sources/internal-elb/patches/internal-elb.yaml
@@ -0,0 +1,14 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: AWSCluster
+metadata:
+  name: "${CLUSTER_NAME}"
+spec:
+  controlPlaneLoadBalancer:
+    scheme: internal
+  network:
+    vpc:
+      id: "${WL_VPC_ID}"
+    subnets:
+    - id: "${WL_PUBLIC_SUBNET_ID}"
+    - id: "${WL_PRIVATE_SUBNET_ID}"
+
diff --git a/test/e2e/data/infrastructure-aws/kustomize_sources/peered-remote/kustomization.yaml b/test/e2e/data/infrastructure-aws/kustomize_sources/peered-remote/kustomization.yaml
@@ -0,0 +1,5 @@
+resources:
+  - ../remote-management-cluster
+patchesStrategicMerge:
+  - patches/management.yaml
+
diff --git a/test/e2e/data/infrastructure-aws/kustomize_sources/peered-remote/patches/management.yaml b/test/e2e/data/infrastructure-aws/kustomize_sources/peered-remote/patches/management.yaml
@@ -0,0 +1,12 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: AWSCluster
+metadata:
+  name: "${CLUSTER_NAME}"
+spec:
+  network:
+    vpc:
+      id: "${MGMT_VPC_ID}"
+    subnets:
+    - id: "${MGMT_PUBLIC_SUBNET_ID}"
+    - id: "${MGMT_PRIVATE_SUBNET_ID}"
+