Merge pull request #1477 from arvindag07/ip-conflict-remove

Changing the IP range of pods from 100.64.48.0/20 to 100.65.16.0/20 Fixes #1461
GoogleCloudPlatform · Jun 29, 2023 · 0f5c989 · 0f5c989
2 parents f0fbc14 + c10fdc7
commit 0f5c989
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 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
@@ -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.64.48.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
@@ -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: 192.168.1.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
@@ -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.64.48.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-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: 192.168.1.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
@@ -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.64.48.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
@@ -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.64.48.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-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.64.48.0/20
-   services: 100.64.64.0/24
+   pods: 100.64.0.0/24
+   services: 100.64.1.0/24