From 0978cd97e840bafd1e46d9248768acddc075e7fe Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Sun, 27 Sep 2020 20:08:09 -0500 Subject: [PATCH] Add second additionalNetworkCIDR w/ incorrect test output --- .../update_cluster/complex/cloudformation.json | 11 ++++++++++- .../update_cluster/complex/in-legacy-v1alpha2.yaml | 1 + .../update_cluster/complex/in-v1alpha2.yaml | 1 + .../integration/update_cluster/complex/kubernetes.tf | 7 ++++++- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/integration/update_cluster/complex/cloudformation.json b/tests/integration/update_cluster/complex/cloudformation.json index 9e40b2886e..65175b18ab 100644 --- a/tests/integration/update_cluster/complex/cloudformation.json +++ b/tests/integration/update_cluster/complex/cloudformation.json @@ -931,7 +931,16 @@ "VpcId": { "Ref": "AWSEC2VPCcomplexexamplecom" }, - "CidrBlock": "10.1.0.0/16" + "CidrBlock": "10.2.0.0/16" + } + }, + "AWSEC2VPCCidrBlock1020016": { + "Type": "AWS::EC2::VPCCidrBlock", + "Properties": { + "VpcId": { + "Ref": "AWSEC2VPCcomplexexamplecom" + }, + "CidrBlock": "10.2.0.0/16" } }, "AWSEC2VPCDHCPOptionsAssociationcomplexexamplecom": { diff --git a/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml b/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml index d9f1182bec..5092141aef 100644 --- a/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml +++ b/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml @@ -42,6 +42,7 @@ spec: networkCIDR: 172.20.0.0/16 additionalNetworkCIDRs: - 10.1.0.0/16 + - 10.2.0.0/16 networking: kubenet: {} nodePortAccess: diff --git a/tests/integration/update_cluster/complex/in-v1alpha2.yaml b/tests/integration/update_cluster/complex/in-v1alpha2.yaml index 9386163c96..34272bff8e 100644 --- a/tests/integration/update_cluster/complex/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/complex/in-v1alpha2.yaml @@ -42,6 +42,7 @@ spec: networkCIDR: 172.20.0.0/16 additionalNetworkCIDRs: - 10.1.0.0/16 + - 10.2.0.0/16 networking: kubenet: {} nodePortAccess: diff --git a/tests/integration/update_cluster/complex/kubernetes.tf b/tests/integration/update_cluster/complex/kubernetes.tf index 98ed770b94..7c3d53a6ea 100644 --- a/tests/integration/update_cluster/complex/kubernetes.tf +++ b/tests/integration/update_cluster/complex/kubernetes.tf @@ -732,7 +732,12 @@ resource "aws_vpc_dhcp_options" "complex-example-com" { } resource "aws_vpc_ipv4_cidr_block_association" "cidr-10-1-0-0--16" { - cidr_block = "10.1.0.0/16" + cidr_block = "10.2.0.0/16" + vpc_id = aws_vpc.complex-example-com.id +} + +resource "aws_vpc_ipv4_cidr_block_association" "cidr-10-2-0-0--16" { + cidr_block = "10.2.0.0/16" vpc_id = aws_vpc.complex-example-com.id }