Skip to content

Commit 29cdc1d

Browse files
Josh Ferrellsedefsavas
andcommitted
Functioning Sec Groups E2E test and refactor AWS infrastructure functions
Add additional filter to getSubnetID function based on clusterName Apply suggestions from code review Co-authored-by: sedefsavas <[email protected]>
1 parent f56c24f commit 29cdc1d

File tree

8 files changed

+343
-39
lines changed

8 files changed

+343
-39
lines changed

test/e2e/data/e2e_conf.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,8 @@ providers:
224224
- sourcePath: "./infrastructure-aws/generated/cluster-template.yaml"
225225
- sourcePath: "./infrastructure-aws/generated/cluster-template-gpu.yaml"
226226
- sourcePath: "./infrastructure-aws/generated/cluster-template-upgrades.yaml"
227+
- sourcePath: "./infrastructure-aws/generated/cluster-template-external-infrastructure.yaml"
228+
- sourcePath: "./infrastructure-aws/generated/cluster-template-external-securitygroups.yaml"
227229
- sourcePath: "./infrastructure-aws/kustomize_sources/topology/clusterclass-quick-start.yaml"
228230
- sourcePath: "./shared/v1beta1_provider/metadata.yaml"
229231
replacements:
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
resources:
2+
- ../limit-az
3+
patchesStrategicMerge:
4+
- patches/external-infrastructure.yaml
5+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
2+
kind: AWSCluster
3+
metadata:
4+
name: "${CLUSTER_NAME}"
5+
spec:
6+
network:
7+
vpc:
8+
id: "${VPC_ID}"
9+
subnets:
10+
- id: "${PUBLIC_SUBNET_ID}"
11+
- id: "${PRIVATE_SUBNET_ID}"
12+
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
resources:
2+
- ../external-infrastructure
3+
patchesStrategicMerge:
4+
- patches/external-securitygroups.yaml
5+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
2+
kind: AWSCluster
3+
metadata:
4+
name: "${CLUSTER_NAME}"
5+
spec:
6+
network:
7+
securityGroupOverrides:
8+
controlplane: "${CP_SG_ID}"
9+
apiserver-lb: "${API_SG_ID}"
10+
node: "${NODE_SG_ID}"
11+
lb: "${LB_SG_ID}"
12+

0 commit comments

Comments
 (0)