From f75bc321b945445c1e9520ef1684aac51febe558 Mon Sep 17 00:00:00 2001 From: Arvind Ganesh Date: Wed, 28 Jun 2023 14:15:35 -0400 Subject: [PATCH 1/3] Changing the IP range of pods from 100.64.48.0/20 to 100.65.16.0/20 as there is an overlap in 100.64.0.0/16 range with dev-gke-nodes-ew1.yaml --- .../data/subnets/dev/dev-dataplatform-ew1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fast/stages/2-networking-a-peering/data/subnets/dev/dev-dataplatform-ew1.yaml b/fast/stages/2-networking-a-peering/data/subnets/dev/dev-dataplatform-ew1.yaml index 4e5690c0f2..b27e55cda1 100644 --- a/fast/stages/2-networking-a-peering/data/subnets/dev/dev-dataplatform-ew1.yaml +++ b/fast/stages/2-networking-a-peering/data/subnets/dev/dev-dataplatform-ew1.yaml @@ -4,5 +4,5 @@ region: europe-west1 description: Default subnet for dev Data Platform ip_cidr_range: 10.128.48.0/24 secondary_ip_ranges: - pods: 100.64.48.0/20 + pods: 100.65.16.0/20 services: 100.64.64.0/24 From 0b19a16593abedd3b52e1310e094bbbb2bafc72d Mon Sep 17 00:00:00 2001 From: Arvind Ganesh Date: Wed, 28 Jun 2023 14:45:33 -0400 Subject: [PATCH 2/3] Changing the IP ranges in all networking stages --- .../data/subnets/dev/dev-gke-nodes-ew1.yaml | 2 +- .../data/subnets/dev/dev-dataplatform-ew1.yaml | 4 ++-- .../data/subnets/dev/dev-gke-nodes-ew1.yaml | 2 +- .../data/subnets/dev/dev-dataplatform-ew1.yaml | 2 +- .../data/subnets/dev/dev-dataplatform-ew1.yaml | 4 ++-- .../data/subnets/dev/dev-dataplatform-ew1.yaml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fast/stages/2-networking-a-peering/data/subnets/dev/dev-gke-nodes-ew1.yaml b/fast/stages/2-networking-a-peering/data/subnets/dev/dev-gke-nodes-ew1.yaml index 9b52511e98..1a6d9e4d5f 100644 --- a/fast/stages/2-networking-a-peering/data/subnets/dev/dev-gke-nodes-ew1.yaml +++ b/fast/stages/2-networking-a-peering/data/subnets/dev/dev-gke-nodes-ew1.yaml @@ -5,4 +5,4 @@ description: Default subnet for prod gke nodes ip_cidr_range: 10.64.0.0/24 secondary_ip_ranges: pods: 100.64.0.0/16 - services: 192.168.1.0/24 + services: 100.65.64.0/24 diff --git a/fast/stages/2-networking-b-vpn/data/subnets/dev/dev-dataplatform-ew1.yaml b/fast/stages/2-networking-b-vpn/data/subnets/dev/dev-dataplatform-ew1.yaml index 4e5690c0f2..d09a34fe8a 100644 --- a/fast/stages/2-networking-b-vpn/data/subnets/dev/dev-dataplatform-ew1.yaml +++ b/fast/stages/2-networking-b-vpn/data/subnets/dev/dev-dataplatform-ew1.yaml @@ -4,5 +4,5 @@ region: europe-west1 description: Default subnet for dev Data Platform ip_cidr_range: 10.128.48.0/24 secondary_ip_ranges: - pods: 100.64.48.0/20 - services: 100.64.64.0/24 + pods: 100.65.16.0/20 + services: 100.64.64.0/24 \ No newline at end of file diff --git a/fast/stages/2-networking-b-vpn/data/subnets/dev/dev-gke-nodes-ew1.yaml b/fast/stages/2-networking-b-vpn/data/subnets/dev/dev-gke-nodes-ew1.yaml index 9b52511e98..1a6d9e4d5f 100644 --- a/fast/stages/2-networking-b-vpn/data/subnets/dev/dev-gke-nodes-ew1.yaml +++ b/fast/stages/2-networking-b-vpn/data/subnets/dev/dev-gke-nodes-ew1.yaml @@ -5,4 +5,4 @@ description: Default subnet for prod gke nodes ip_cidr_range: 10.64.0.0/24 secondary_ip_ranges: pods: 100.64.0.0/16 - services: 192.168.1.0/24 + services: 100.65.64.0/24 diff --git a/fast/stages/2-networking-c-nva/data/subnets/dev/dev-dataplatform-ew1.yaml b/fast/stages/2-networking-c-nva/data/subnets/dev/dev-dataplatform-ew1.yaml index 4e5690c0f2..b27e55cda1 100644 --- a/fast/stages/2-networking-c-nva/data/subnets/dev/dev-dataplatform-ew1.yaml +++ b/fast/stages/2-networking-c-nva/data/subnets/dev/dev-dataplatform-ew1.yaml @@ -4,5 +4,5 @@ region: europe-west1 description: Default subnet for dev Data Platform ip_cidr_range: 10.128.48.0/24 secondary_ip_ranges: - pods: 100.64.48.0/20 + pods: 100.65.16.0/20 services: 100.64.64.0/24 diff --git a/fast/stages/2-networking-d-separate-envs/data/subnets/dev/dev-dataplatform-ew1.yaml b/fast/stages/2-networking-d-separate-envs/data/subnets/dev/dev-dataplatform-ew1.yaml index 4e5690c0f2..d09a34fe8a 100644 --- a/fast/stages/2-networking-d-separate-envs/data/subnets/dev/dev-dataplatform-ew1.yaml +++ b/fast/stages/2-networking-d-separate-envs/data/subnets/dev/dev-dataplatform-ew1.yaml @@ -4,5 +4,5 @@ region: europe-west1 description: Default subnet for dev Data Platform ip_cidr_range: 10.128.48.0/24 secondary_ip_ranges: - pods: 100.64.48.0/20 - services: 100.64.64.0/24 + pods: 100.65.16.0/20 + services: 100.64.64.0/24 \ No newline at end of file diff --git a/fast/stages/2-networking-e-nva-bgp/data/subnets/dev/dev-dataplatform-ew1.yaml b/fast/stages/2-networking-e-nva-bgp/data/subnets/dev/dev-dataplatform-ew1.yaml index 4e5690c0f2..b27e55cda1 100644 --- a/fast/stages/2-networking-e-nva-bgp/data/subnets/dev/dev-dataplatform-ew1.yaml +++ b/fast/stages/2-networking-e-nva-bgp/data/subnets/dev/dev-dataplatform-ew1.yaml @@ -4,5 +4,5 @@ region: europe-west1 description: Default subnet for dev Data Platform ip_cidr_range: 10.128.48.0/24 secondary_ip_ranges: - pods: 100.64.48.0/20 + pods: 100.65.16.0/20 services: 100.64.64.0/24 From d3e4864b57f6b84f76d4d08c4f99fdc23dcc7b8a Mon Sep 17 00:00:00 2001 From: Arvind Ganesh Date: Thu, 29 Jun 2023 12:24:29 -0400 Subject: [PATCH 3/3] Making the changes as suggested in https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1477#issuecomment-1612846907 --- .../data/subnets/dev/dev-dataplatform-ew1.yaml | 6 +++--- .../data/subnets/dev/dev-gke-nodes-ew1.yaml | 6 +++--- .../data/subnets/dev/dev-dataplatform-ew1.yaml | 6 +++--- .../data/subnets/dev/dev-gke-nodes-ew1.yaml | 6 +++--- .../data/subnets/dev/dev-dataplatform-ew1.yaml | 6 +++--- .../data/subnets/dev/dev-dataplatform-ew1.yaml | 6 +++--- .../data/subnets/dev/dev-dataplatform-ew1.yaml | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/fast/stages/2-networking-a-peering/data/subnets/dev/dev-dataplatform-ew1.yaml b/fast/stages/2-networking-a-peering/data/subnets/dev/dev-dataplatform-ew1.yaml index b27e55cda1..1e8234bc3e 100644 --- a/fast/stages/2-networking-a-peering/data/subnets/dev/dev-dataplatform-ew1.yaml +++ b/fast/stages/2-networking-a-peering/data/subnets/dev/dev-dataplatform-ew1.yaml @@ -2,7 +2,7 @@ region: europe-west1 description: Default subnet for dev Data Platform -ip_cidr_range: 10.128.48.0/24 +ip_cidr_range: 100.127.48.0/24 secondary_ip_ranges: - pods: 100.65.16.0/20 - services: 100.64.64.0/24 + pods: 100.64.0.0/24 + services: 100.64.1.0/24 diff --git a/fast/stages/2-networking-a-peering/data/subnets/dev/dev-gke-nodes-ew1.yaml b/fast/stages/2-networking-a-peering/data/subnets/dev/dev-gke-nodes-ew1.yaml index 1a6d9e4d5f..fad1fbe1e9 100644 --- a/fast/stages/2-networking-a-peering/data/subnets/dev/dev-gke-nodes-ew1.yaml +++ b/fast/stages/2-networking-a-peering/data/subnets/dev/dev-gke-nodes-ew1.yaml @@ -2,7 +2,7 @@ region: europe-west1 description: Default subnet for prod gke nodes -ip_cidr_range: 10.64.0.0/24 +ip_cidr_range: 100.127.49.0/24 secondary_ip_ranges: - pods: 100.64.0.0/16 - services: 100.65.64.0/24 + pods: 100.65.0.0/24 + services: 100.65.1.0/24 diff --git a/fast/stages/2-networking-b-vpn/data/subnets/dev/dev-dataplatform-ew1.yaml b/fast/stages/2-networking-b-vpn/data/subnets/dev/dev-dataplatform-ew1.yaml index d09a34fe8a..61dc38a278 100644 --- a/fast/stages/2-networking-b-vpn/data/subnets/dev/dev-dataplatform-ew1.yaml +++ b/fast/stages/2-networking-b-vpn/data/subnets/dev/dev-dataplatform-ew1.yaml @@ -2,7 +2,7 @@ region: europe-west1 description: Default subnet for dev Data Platform -ip_cidr_range: 10.128.48.0/24 +ip_cidr_range: 100.127.48.0/24 secondary_ip_ranges: - pods: 100.65.16.0/20 - services: 100.64.64.0/24 \ No newline at end of file + pods: 100.64.0.0/24 + services: 100.64.1.0/24 \ No newline at end of file diff --git a/fast/stages/2-networking-b-vpn/data/subnets/dev/dev-gke-nodes-ew1.yaml b/fast/stages/2-networking-b-vpn/data/subnets/dev/dev-gke-nodes-ew1.yaml index 1a6d9e4d5f..fad1fbe1e9 100644 --- a/fast/stages/2-networking-b-vpn/data/subnets/dev/dev-gke-nodes-ew1.yaml +++ b/fast/stages/2-networking-b-vpn/data/subnets/dev/dev-gke-nodes-ew1.yaml @@ -2,7 +2,7 @@ region: europe-west1 description: Default subnet for prod gke nodes -ip_cidr_range: 10.64.0.0/24 +ip_cidr_range: 100.127.49.0/24 secondary_ip_ranges: - pods: 100.64.0.0/16 - services: 100.65.64.0/24 + pods: 100.65.0.0/24 + services: 100.65.1.0/24 diff --git a/fast/stages/2-networking-c-nva/data/subnets/dev/dev-dataplatform-ew1.yaml b/fast/stages/2-networking-c-nva/data/subnets/dev/dev-dataplatform-ew1.yaml index b27e55cda1..1e8234bc3e 100644 --- a/fast/stages/2-networking-c-nva/data/subnets/dev/dev-dataplatform-ew1.yaml +++ b/fast/stages/2-networking-c-nva/data/subnets/dev/dev-dataplatform-ew1.yaml @@ -2,7 +2,7 @@ region: europe-west1 description: Default subnet for dev Data Platform -ip_cidr_range: 10.128.48.0/24 +ip_cidr_range: 100.127.48.0/24 secondary_ip_ranges: - pods: 100.65.16.0/20 - services: 100.64.64.0/24 + pods: 100.64.0.0/24 + services: 100.64.1.0/24 diff --git a/fast/stages/2-networking-d-separate-envs/data/subnets/dev/dev-dataplatform-ew1.yaml b/fast/stages/2-networking-d-separate-envs/data/subnets/dev/dev-dataplatform-ew1.yaml index d09a34fe8a..61dc38a278 100644 --- a/fast/stages/2-networking-d-separate-envs/data/subnets/dev/dev-dataplatform-ew1.yaml +++ b/fast/stages/2-networking-d-separate-envs/data/subnets/dev/dev-dataplatform-ew1.yaml @@ -2,7 +2,7 @@ region: europe-west1 description: Default subnet for dev Data Platform -ip_cidr_range: 10.128.48.0/24 +ip_cidr_range: 100.127.48.0/24 secondary_ip_ranges: - pods: 100.65.16.0/20 - services: 100.64.64.0/24 \ No newline at end of file + pods: 100.64.0.0/24 + services: 100.64.1.0/24 \ No newline at end of file diff --git a/fast/stages/2-networking-e-nva-bgp/data/subnets/dev/dev-dataplatform-ew1.yaml b/fast/stages/2-networking-e-nva-bgp/data/subnets/dev/dev-dataplatform-ew1.yaml index b27e55cda1..d997a45933 100644 --- a/fast/stages/2-networking-e-nva-bgp/data/subnets/dev/dev-dataplatform-ew1.yaml +++ b/fast/stages/2-networking-e-nva-bgp/data/subnets/dev/dev-dataplatform-ew1.yaml @@ -2,7 +2,7 @@ region: europe-west1 description: Default subnet for dev Data Platform -ip_cidr_range: 10.128.48.0/24 +ip_cidr_range: 100.127.48.0/24 secondary_ip_ranges: - pods: 100.65.16.0/20 - services: 100.64.64.0/24 + pods: 100.64.0.0/24 + services: 100.64.1.0/24