From 9d032686dea07f319591014385c1ba74d4c43d41 Mon Sep 17 00:00:00 2001 From: Jont828 Date: Tue, 17 Dec 2024 13:49:44 -0500 Subject: [PATCH] Try changing subnet CIDRs to avoid full subnet err --- templates/cluster-template-aad.yaml | 4 ++-- templates/cluster-template-azure-bastion.yaml | 4 ++-- templates/cluster-template-azure-cni-v1.yaml | 4 ++-- templates/cluster-template-ephemeral.yaml | 4 ++-- templates/cluster-template-flatcar-sysext.yaml | 4 ++-- templates/cluster-template-flatcar.yaml | 4 ++-- templates/cluster-template-machinepool-windows.yaml | 4 ++-- templates/cluster-template-machinepool.yaml | 4 ++-- templates/cluster-template-nvidia-gpu.yaml | 4 ++-- templates/cluster-template-private.yaml | 4 ++-- templates/cluster-template-windows.yaml | 4 ++-- templates/cluster-template.yaml | 4 ++-- templates/flavors/base/cluster-template.yaml | 4 ++-- templates/test/ci/cluster-template-prow-azure-cni-v1.yaml | 4 ++-- templates/test/ci/cluster-template-prow-ci-version-dra.yaml | 4 ++-- templates/test/ci/cluster-template-prow-ci-version.yaml | 4 ++-- templates/test/ci/cluster-template-prow-flatcar-sysext.yaml | 4 ++-- templates/test/ci/cluster-template-prow-flatcar.yaml | 4 ++-- templates/test/ci/cluster-template-prow-load.yaml | 4 ++-- .../ci/cluster-template-prow-machine-pool-ci-version.yaml | 4 ++-- .../test/ci/cluster-template-prow-machine-pool-flex.yaml | 4 ++-- templates/test/ci/cluster-template-prow-machine-pool.yaml | 4 ++-- templates/test/ci/cluster-template-prow-nvidia-gpu.yaml | 4 ++-- templates/test/ci/cluster-template-prow-spot.yaml | 4 ++-- templates/test/ci/cluster-template-prow.yaml | 4 ++-- templates/test/dev/cluster-template-custom-builds-dra.yaml | 4 ++-- .../test/dev/cluster-template-custom-builds-machine-pool.yaml | 4 ++-- templates/test/dev/cluster-template-custom-builds.yaml | 4 ++-- 28 files changed, 56 insertions(+), 56 deletions(-) diff --git a/templates/cluster-template-aad.yaml b/templates/cluster-template-aad.yaml index 91fa595fdc6..2899748ab4d 100644 --- a/templates/cluster-template-aad.yaml +++ b/templates/cluster-template-aad.yaml @@ -37,11 +37,11 @@ spec: name: ${CLUSTER_NAME}-api-lb subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/cluster-template-azure-bastion.yaml b/templates/cluster-template-azure-bastion.yaml index 11636c63b4c..982d042df1d 100644 --- a/templates/cluster-template-azure-bastion.yaml +++ b/templates/cluster-template-azure-bastion.yaml @@ -39,11 +39,11 @@ spec: name: ${CLUSTER_NAME}-api-lb subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/cluster-template-azure-cni-v1.yaml b/templates/cluster-template-azure-cni-v1.yaml index 116a3105c73..724f57335e1 100644 --- a/templates/cluster-template-azure-cni-v1.yaml +++ b/templates/cluster-template-azure-cni-v1.yaml @@ -37,11 +37,11 @@ spec: name: ${CLUSTER_NAME}-api-lb subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/cluster-template-ephemeral.yaml b/templates/cluster-template-ephemeral.yaml index b2860d90e3b..04072926bbd 100644 --- a/templates/cluster-template-ephemeral.yaml +++ b/templates/cluster-template-ephemeral.yaml @@ -37,11 +37,11 @@ spec: name: ${CLUSTER_NAME}-api-lb subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/cluster-template-flatcar-sysext.yaml b/templates/cluster-template-flatcar-sysext.yaml index 4d05d26b0d9..355bd42d1c8 100644 --- a/templates/cluster-template-flatcar-sysext.yaml +++ b/templates/cluster-template-flatcar-sysext.yaml @@ -257,11 +257,11 @@ spec: networkSpec: subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/cluster-template-flatcar.yaml b/templates/cluster-template-flatcar.yaml index 398bb4305cd..15ff0ec0d54 100644 --- a/templates/cluster-template-flatcar.yaml +++ b/templates/cluster-template-flatcar.yaml @@ -37,11 +37,11 @@ spec: name: ${CLUSTER_NAME}-api-lb subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/cluster-template-machinepool-windows.yaml b/templates/cluster-template-machinepool-windows.yaml index 0b6e9c1afd4..5b6af88908d 100644 --- a/templates/cluster-template-machinepool-windows.yaml +++ b/templates/cluster-template-machinepool-windows.yaml @@ -35,11 +35,11 @@ spec: networkSpec: subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/cluster-template-machinepool.yaml b/templates/cluster-template-machinepool.yaml index 70f1c85c6e1..8db4513ac7e 100644 --- a/templates/cluster-template-machinepool.yaml +++ b/templates/cluster-template-machinepool.yaml @@ -31,11 +31,11 @@ spec: networkSpec: subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/cluster-template-nvidia-gpu.yaml b/templates/cluster-template-nvidia-gpu.yaml index 82498a812f2..48abbe84950 100644 --- a/templates/cluster-template-nvidia-gpu.yaml +++ b/templates/cluster-template-nvidia-gpu.yaml @@ -37,11 +37,11 @@ spec: name: ${CLUSTER_NAME}-api-lb subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/cluster-template-private.yaml b/templates/cluster-template-private.yaml index 7526b4f35e7..d8ff9e5bcd1 100644 --- a/templates/cluster-template-private.yaml +++ b/templates/cluster-template-private.yaml @@ -40,11 +40,11 @@ spec: frontendIPsCount: 1 subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/cluster-template-windows.yaml b/templates/cluster-template-windows.yaml index 659bdec468d..d4dbe8eb0b6 100644 --- a/templates/cluster-template-windows.yaml +++ b/templates/cluster-template-windows.yaml @@ -41,11 +41,11 @@ spec: name: ${CLUSTER_NAME}-api-lb subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml index 53dc584b069..67cd11266dc 100644 --- a/templates/cluster-template.yaml +++ b/templates/cluster-template.yaml @@ -37,11 +37,11 @@ spec: name: ${CLUSTER_NAME}-api-lb subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/flavors/base/cluster-template.yaml b/templates/flavors/base/cluster-template.yaml index 3b06eef5182..34c3e82b61e 100644 --- a/templates/flavors/base/cluster-template.yaml +++ b/templates/flavors/base/cluster-template.yaml @@ -33,11 +33,11 @@ spec: - name: control-plane-subnet role: control-plane cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 - name: node-subnet role: node cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 --- kind: KubeadmControlPlane apiVersion: controlplane.cluster.x-k8s.io/v1beta1 diff --git a/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml b/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml index 62167053b89..4ef9492998c 100644 --- a/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml +++ b/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml @@ -43,11 +43,11 @@ spec: name: ${CLUSTER_NAME}-api-lb subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/test/ci/cluster-template-prow-ci-version-dra.yaml b/templates/test/ci/cluster-template-prow-ci-version-dra.yaml index d9047761738..2dd49a65ce4 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-dra.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-dra.yaml @@ -42,11 +42,11 @@ spec: networkSpec: subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml index f7bbaa26b45..53a5736e088 100644 --- a/templates/test/ci/cluster-template-prow-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version.yaml @@ -42,11 +42,11 @@ spec: networkSpec: subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/test/ci/cluster-template-prow-flatcar-sysext.yaml b/templates/test/ci/cluster-template-prow-flatcar-sysext.yaml index 0fde2f2e774..11b7e42b168 100644 --- a/templates/test/ci/cluster-template-prow-flatcar-sysext.yaml +++ b/templates/test/ci/cluster-template-prow-flatcar-sysext.yaml @@ -338,11 +338,11 @@ spec: networkSpec: subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/test/ci/cluster-template-prow-flatcar.yaml b/templates/test/ci/cluster-template-prow-flatcar.yaml index c979e9743a9..d2f64e6208c 100644 --- a/templates/test/ci/cluster-template-prow-flatcar.yaml +++ b/templates/test/ci/cluster-template-prow-flatcar.yaml @@ -44,11 +44,11 @@ spec: name: ${CLUSTER_NAME}-api-lb subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/test/ci/cluster-template-prow-load.yaml b/templates/test/ci/cluster-template-prow-load.yaml index 60a9daa89f4..25155b058de 100644 --- a/templates/test/ci/cluster-template-prow-load.yaml +++ b/templates/test/ci/cluster-template-prow-load.yaml @@ -43,11 +43,11 @@ spec: networkSpec: subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml index e941b758b61..c567d8891f1 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml @@ -42,11 +42,11 @@ spec: networkSpec: subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml index 64523298e52..14c5ed4f15b 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml @@ -42,11 +42,11 @@ spec: networkSpec: subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml index 6c11b647d79..181dccfea0d 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool.yaml @@ -42,11 +42,11 @@ spec: networkSpec: subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml index 3eedb7697c0..4aeee9ed237 100644 --- a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml +++ b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml @@ -44,11 +44,11 @@ spec: name: ${CLUSTER_NAME}-api-lb subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/test/ci/cluster-template-prow-spot.yaml b/templates/test/ci/cluster-template-prow-spot.yaml index 608a7038044..66b86f3d73d 100644 --- a/templates/test/ci/cluster-template-prow-spot.yaml +++ b/templates/test/ci/cluster-template-prow-spot.yaml @@ -44,11 +44,11 @@ spec: name: ${CLUSTER_NAME}-api-lb subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml index 36f62a9a42c..45e6c28e8a6 100644 --- a/templates/test/ci/cluster-template-prow.yaml +++ b/templates/test/ci/cluster-template-prow.yaml @@ -41,11 +41,11 @@ spec: networkSpec: subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/test/dev/cluster-template-custom-builds-dra.yaml b/templates/test/dev/cluster-template-custom-builds-dra.yaml index 3df3cc2bba0..4db48f2f86d 100644 --- a/templates/test/dev/cluster-template-custom-builds-dra.yaml +++ b/templates/test/dev/cluster-template-custom-builds-dra.yaml @@ -42,11 +42,11 @@ spec: networkSpec: subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml index 2522901e235..d7e478f247d 100644 --- a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml +++ b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml @@ -42,11 +42,11 @@ spec: networkSpec: subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml index f4f6c0c5784..80f4fd4ad70 100644 --- a/templates/test/dev/cluster-template-custom-builds.yaml +++ b/templates/test/dev/cluster-template-custom-builds.yaml @@ -42,11 +42,11 @@ spec: networkSpec: subnets: - cidrBlocks: - - 10.0.0.0/24 + - 10.0.0.0/20 name: control-plane-subnet role: control-plane - cidrBlocks: - - 10.0.1.0/24 + - 10.0.16.0/20 name: node-subnet role: node vnet: