From 6b4bca10bd98dc72421bb7aad8367cedc11ea9de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wiktor=20Niesiob=C4=99dzki?= Date: Thu, 8 Jun 2023 05:39:09 +0000 Subject: [PATCH 1/2] Use RFC6598 addresses for pods and subnets 10.128.0.0/9 is public network. Closes: #1424 --- .../data/subnets/dev/dev-dataplatform-ew1.yaml | 4 ++-- .../data/subnets/dev/dev-dataplatform-ew1.yaml | 4 ++-- .../data/subnets/dev/dev-dataplatform-ew1.yaml | 4 ++-- .../data/subnets/dev/dev-dataplatform-ew1.yaml | 4 ++-- .../data/subnets/dev/dev-dataplatform-ew1.yaml | 4 ++-- 5 files changed, 10 insertions(+), 10 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 2c682405..4e5690c0 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.128.48.0/20 - services: 100.255.48.0/24 + pods: 100.64.48.0/20 + services: 100.64.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 2c682405..4e5690c0 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.128.48.0/20 - services: 100.255.48.0/24 + pods: 100.64.48.0/20 + services: 100.64.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 2c682405..4e5690c0 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.128.48.0/20 - services: 100.255.48.0/24 + pods: 100.64.48.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 2c682405..4e5690c0 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.128.48.0/20 - services: 100.255.48.0/24 + pods: 100.64.48.0/20 + services: 100.64.64.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 index 2c682405..4e5690c0 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.128.48.0/20 - services: 100.255.48.0/24 + pods: 100.64.48.0/20 + services: 100.64.64.0/24 From a7b944aa8e9b902d13ca9724ad5faaa85b3e1313 Mon Sep 17 00:00:00 2001 From: Ludovico Magnocavallo Date: Thu, 8 Jun 2023 12:05:54 +0200 Subject: [PATCH 2/2] fix serverless neg example (#1430) --- modules/net-ilb-l7/README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/net-ilb-l7/README.md b/modules/net-ilb-l7/README.md index 64d47623..330a9a5a 100644 --- a/modules/net-ilb-l7/README.md +++ b/modules/net-ilb-l7/README.md @@ -283,11 +283,7 @@ module "ilb-l7" { region = "europe-west1" backend_service_configs = { default = { - backends = [{ - balancing_mode = "RATE" - group = "my-neg" - max_rate = { per_endpoint = 1 } - }] + backends = [{ group = "my-neg" }] } } neg_configs = {