From 2e73a3fab813c093a97382e850c4bf7083b7d850 Mon Sep 17 00:00:00 2001 From: Nawaz Hussain Khazielakha Date: Tue, 4 Feb 2025 12:21:31 -0800 Subject: [PATCH] rewrite the IPs of the CIDRs --- Tiltfile | 36 +++++++++++++++---- templates/internal/aad/kustomization.yaml | 12 +++---- .../internal/azure-bastion/kustomization.yaml | 12 +++---- .../internal/azure-cni-v1/kustomization.yaml | 12 +++---- templates/internal/cluster-template-aad.yaml | 10 +++--- .../cluster-template-azure-bastion.yaml | 10 +++--- .../cluster-template-azure-cni-v1.yaml | 10 +++--- .../internal/cluster-template-dual-stack.yaml | 10 +++--- .../internal/cluster-template-edgezone.yaml | 10 +++--- .../internal/cluster-template-ephemeral.yaml | 10 +++--- .../cluster-template-flatcar-sysext.yaml | 10 +++--- .../internal/cluster-template-flatcar.yaml | 10 +++--- templates/internal/cluster-template-ipv6.yaml | 10 +++--- .../internal/cluster-template-nvidia-gpu.yaml | 10 +++--- .../internal/cluster-template-private.yaml | 10 +++--- .../internal/cluster-template-windows.yaml | 12 +++---- templates/internal/cluster-template.yaml | 10 +++--- templates/internal/default/kustomization.yaml | 12 +++---- .../internal/dual-stack/kustomization.yaml | 12 +++---- .../internal/edgezone/kustomization.yaml | 12 +++---- .../internal/ephemeral/kustomization.yaml | 12 +++---- .../flatcar-sysext/kustomization.yaml | 12 +++---- templates/internal/flatcar/kustomization.yaml | 12 +++---- templates/internal/ipv6/kustomization.yaml | 12 +++---- .../internal/nvidia-gpu/kustomization.yaml | 12 +++---- templates/internal/private/kustomization.yaml | 12 +++---- templates/internal/windows/kustomization.yaml | 12 +++---- 27 files changed, 174 insertions(+), 150 deletions(-) diff --git a/Tiltfile b/Tiltfile index 96e050c0452..e63b78b6c87 100644 --- a/Tiltfile +++ b/Tiltfile @@ -312,9 +312,10 @@ def flavors(): os.environ.update({az_key_name: read_file_from_path(default_key_path)}) # Prefer templates/internal if subscription-type is msft + # TODO: improve this subscription type check template_list = [] if settings.get("subscription-type", "") == "msft": - print("Using Azure subscription type: msft. CAPZ flavors from ./templates/internal will be used.") + print("Using Azure subscription type: corporate. Selecting CAPZ flavors from ./templates/internal .") template_list = [item for item in listdir("./templates/internal")] else: template_list = [item for item in listdir("./templates")] @@ -343,6 +344,7 @@ def deploy_worker_templates(template, substitutions): fail(template + " not found") yaml = str(read_file(template)) + parsed_yamls=decode_yaml_stream(yaml) flavor = os.path.basename(template).replace("cluster-template-", "").replace(".yaml", "") # for the base cluster-template, flavor is "default" @@ -396,12 +398,34 @@ def deploy_worker_templates(template, substitutions): flavor_name = os.path.basename(flavor) flavor_cmd = "RANDOM=$(bash -c 'echo $RANDOM'); " + + if settings.get("subscription-type", "") == "msft": + if apiserver_lb_private_ip != "": + flavor_cmd += "export AZURE_INTERNAL_LB_PRIVATE_IP=\"" + apiserver_lb_private_ip + "\"; " + else: + azurecluster_doc = None + + for d in parsed_yamls: + # Safely handle empty/null documents + if d not None and d.get("kind") == "AzureCluster": + azurecluster_doc = d + break + + if azurecluster_doc == None: + fail("No AzureCluster kind found in YAML") + else: + print("Found an AzureCluster doc") + # For example, extract a field: + private_ip = azurecluster_doc["spec"]["networkSpec"]["apiServerLB"]["frontendIPs"][1]["privateIP"] + print("Private IP is:", private_ip) + flavor_cmd += "export AZURE_INTERNAL_LB_PRIVATE_IP=\"" + private_ip + "\"; " + # TODO: maintain a matrix for flavors and their respective internal LB IPs - apiserver_lb_private_ip = os.getenv("AZURE_INTERNAL_LB_PRIVATE_IP", "") - if "windows-apiserver-ilb" in flavor and apiserver_lb_private_ip == "": - flavor_cmd += "export AZURE_INTERNAL_LB_PRIVATE_IP=\"40.0.11.100\"; " - elif "apiserver-ilb" in flavor and apiserver_lb_private_ip == "": - flavor_cmd += "export AZURE_INTERNAL_LB_PRIVATE_IP=\"30.0.11.100\"; " + # apiserver_lb_private_ip = os.getenv("AZURE_INTERNAL_LB_PRIVATE_IP", "") + # if "windows-apiserver-ilb" in flavor and apiserver_lb_private_ip == "": + # flavor_cmd += "export AZURE_INTERNAL_LB_PRIVATE_IP=\"40.0.11.100\"; " + # elif "apiserver-ilb" in flavor and apiserver_lb_private_ip == "": + # flavor_cmd += "export AZURE_INTERNAL_LB_PRIVATE_IP=\"30.0.11.100\"; " flavor_cmd += "export CLUSTER_NAME=" + flavor.replace("windows", "win") + "-$RANDOM; echo " + yaml + "> ./.tiltbuild/" + flavor + "; cat ./.tiltbuild/" + flavor + " | " + envsubst_cmd + " | " + kubectl_cmd + " apply -f -; " flavor_cmd += "echo \"Cluster ${CLUSTER_NAME} created, don't forget to delete\"; " diff --git a/templates/internal/aad/kustomization.yaml b/templates/internal/aad/kustomization.yaml index caf42d60f30..4b0bce0e228 100644 --- a/templates/internal/aad/kustomization.yaml +++ b/templates/internal/aad/kustomization.yaml @@ -13,7 +13,7 @@ patches: patch: |- - op: replace path: /spec/template/spec/preKubeadmCommands/0 - value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-50.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts + value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-31.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts options: allowResourceNotFound: true - target: @@ -21,25 +21,25 @@ patches: patch: |- - op: replace path: /spec/networkSpec/apiServerLB/frontendIPs/1/privateIP - value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-50.0.0.100} + value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-31.0.0.100} - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/vnet/cidrBlocks/0 - value: 50.0.0.0/8 + value: 31.0.0.0/8 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/0/cidrBlocks/0 - value: 50.0.0.0/16 + value: 31.0.0.0/16 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/1/cidrBlocks/0 - value: 50.1.0.0/16 + value: 31.1.0.0/16 - target: kind: KubeadmConfigTemplate name: .*-md-win @@ -47,7 +47,7 @@ patches: - op: replace path: /spec/template/spec/preKubeadmCommands/0 value: - powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-50.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" + powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-31.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" options: allowResourceNotFound: true diff --git a/templates/internal/azure-bastion/kustomization.yaml b/templates/internal/azure-bastion/kustomization.yaml index b02a59f81fe..8d447b76634 100644 --- a/templates/internal/azure-bastion/kustomization.yaml +++ b/templates/internal/azure-bastion/kustomization.yaml @@ -13,7 +13,7 @@ patches: patch: |- - op: replace path: /spec/template/spec/preKubeadmCommands/0 - value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-60.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts + value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-32.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts options: allowResourceNotFound: true - target: @@ -21,25 +21,25 @@ patches: patch: |- - op: replace path: /spec/networkSpec/apiServerLB/frontendIPs/1/privateIP - value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-60.0.0.100} + value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-32.0.0.100} - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/vnet/cidrBlocks/0 - value: 60.0.0.0/8 + value: 32.0.0.0/8 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/0/cidrBlocks/0 - value: 60.0.0.0/16 + value: 32.0.0.0/16 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/1/cidrBlocks/0 - value: 60.1.0.0/16 + value: 32.1.0.0/16 - target: kind: KubeadmConfigTemplate name: .*-md-win @@ -47,7 +47,7 @@ patches: - op: replace path: /spec/template/spec/preKubeadmCommands/0 value: - powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-60.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" + powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-32.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" options: allowResourceNotFound: true diff --git a/templates/internal/azure-cni-v1/kustomization.yaml b/templates/internal/azure-cni-v1/kustomization.yaml index 3d614f6cd11..a8c1e97a791 100644 --- a/templates/internal/azure-cni-v1/kustomization.yaml +++ b/templates/internal/azure-cni-v1/kustomization.yaml @@ -13,7 +13,7 @@ patches: patch: |- - op: replace path: /spec/template/spec/preKubeadmCommands/0 - value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-70.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts + value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-33.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts options: allowResourceNotFound: true - target: @@ -21,25 +21,25 @@ patches: patch: |- - op: replace path: /spec/networkSpec/apiServerLB/frontendIPs/1/privateIP - value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-70.0.0.100} + value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-33.0.0.100} - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/vnet/cidrBlocks/0 - value: 70.0.0.0/8 + value: 33.0.0.0/8 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/0/cidrBlocks/0 - value: 70.0.0.0/16 + value: 33.0.0.0/16 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/1/cidrBlocks/0 - value: 70.1.0.0/16 + value: 33.1.0.0/16 - target: kind: KubeadmConfigTemplate name: .*-md-win @@ -47,7 +47,7 @@ patches: - op: replace path: /spec/template/spec/preKubeadmCommands/0 value: - powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-70.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" + powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-33.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" options: allowResourceNotFound: true diff --git a/templates/internal/cluster-template-aad.yaml b/templates/internal/cluster-template-aad.yaml index 0a89d909181..2cd7864573d 100644 --- a/templates/internal/cluster-template-aad.yaml +++ b/templates/internal/cluster-template-aad.yaml @@ -36,19 +36,19 @@ spec: dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com name: ${CLUSTER_NAME}-api-lb - name: ${CLUSTER_NAME}-internal-lb-private-ip - privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-50.0.0.100} + privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-31.0.0.100} subnets: - cidrBlocks: - - 50.0.0.0/16 + - 31.0.0.0/16 name: control-plane-subnet role: control-plane - cidrBlocks: - - 50.1.0.0/16 + - 31.1.0.0/16 name: node-subnet role: node vnet: cidrBlocks: - - 50.0.0.0/8 + - 31.0.0.0/8 name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet} resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}} subscriptionID: ${AZURE_SUBSCRIPTION_ID} @@ -211,7 +211,7 @@ spec: cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: - - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-50.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' + - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-31.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/templates/internal/cluster-template-azure-bastion.yaml b/templates/internal/cluster-template-azure-bastion.yaml index 94a348dbbc7..bfecd44d1b8 100644 --- a/templates/internal/cluster-template-azure-bastion.yaml +++ b/templates/internal/cluster-template-azure-bastion.yaml @@ -38,19 +38,19 @@ spec: dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com name: ${CLUSTER_NAME}-api-lb - name: ${CLUSTER_NAME}-internal-lb-private-ip - privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-60.0.0.100} + privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-32.0.0.100} subnets: - cidrBlocks: - - 60.0.0.0/16 + - 32.0.0.0/16 name: control-plane-subnet role: control-plane - cidrBlocks: - - 60.1.0.0/16 + - 32.1.0.0/16 name: node-subnet role: node vnet: cidrBlocks: - - 60.0.0.0/8 + - 32.0.0.0/8 name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet} resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}} subscriptionID: ${AZURE_SUBSCRIPTION_ID} @@ -206,7 +206,7 @@ spec: cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: - - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-60.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' + - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-32.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/templates/internal/cluster-template-azure-cni-v1.yaml b/templates/internal/cluster-template-azure-cni-v1.yaml index e8c2fef0c86..153b04a84bc 100644 --- a/templates/internal/cluster-template-azure-cni-v1.yaml +++ b/templates/internal/cluster-template-azure-cni-v1.yaml @@ -36,19 +36,19 @@ spec: dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com name: ${CLUSTER_NAME}-api-lb - name: ${CLUSTER_NAME}-internal-lb-private-ip - privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-70.0.0.100} + privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-33.0.0.100} subnets: - cidrBlocks: - - 70.0.0.0/16 + - 33.0.0.0/16 name: control-plane-subnet role: control-plane - cidrBlocks: - - 70.1.0.0/16 + - 33.1.0.0/16 name: node-subnet role: node vnet: cidrBlocks: - - 70.0.0.0/8 + - 33.0.0.0/8 name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet} resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}} subscriptionID: ${AZURE_SUBSCRIPTION_ID} @@ -213,7 +213,7 @@ spec: max-pods: "110" name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: - - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-70.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' + - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-33.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/templates/internal/cluster-template-dual-stack.yaml b/templates/internal/cluster-template-dual-stack.yaml index 0601d73c7cb..69b1169b284 100644 --- a/templates/internal/cluster-template-dual-stack.yaml +++ b/templates/internal/cluster-template-dual-stack.yaml @@ -43,19 +43,19 @@ spec: dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com name: ${CLUSTER_NAME}-api-lb - name: ${CLUSTER_NAME}-internal-lb-private-ip - privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-100.0.0.100} + privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-34.0.0.100} subnets: - cidrBlocks: - - 100.0.0.0/16 + - 34.0.0.0/16 name: control-plane-subnet role: control-plane - cidrBlocks: - - 100.1.0.0/16 + - 34.1.0.0/16 name: node-subnet role: node vnet: cidrBlocks: - - 100.0.0.0/8 + - 34.0.0.0/8 name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet} resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}} subscriptionID: ${AZURE_SUBSCRIPTION_ID} @@ -235,5 +235,5 @@ spec: cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: - - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-100.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' + - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-34.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts diff --git a/templates/internal/cluster-template-edgezone.yaml b/templates/internal/cluster-template-edgezone.yaml index e2bb8c54670..08d4965630c 100644 --- a/templates/internal/cluster-template-edgezone.yaml +++ b/templates/internal/cluster-template-edgezone.yaml @@ -39,19 +39,19 @@ spec: dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com name: ${CLUSTER_NAME}-api-lb - name: ${CLUSTER_NAME}-internal-lb-private-ip - privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-110.0.0.100} + privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-35.0.0.100} subnets: - cidrBlocks: - - 110.0.0.0/16 + - 35.0.0.0/16 name: control-plane-subnet role: control-plane - cidrBlocks: - - 110.1.0.0/16 + - 35.1.0.0/16 name: node-subnet role: node vnet: cidrBlocks: - - 110.0.0.0/8 + - 35.0.0.0/8 name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet} resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}} subscriptionID: ${AZURE_SUBSCRIPTION_ID} @@ -207,7 +207,7 @@ spec: cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: - - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-110.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' + - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-35.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/templates/internal/cluster-template-ephemeral.yaml b/templates/internal/cluster-template-ephemeral.yaml index c0d47db6f28..500284fd4fb 100644 --- a/templates/internal/cluster-template-ephemeral.yaml +++ b/templates/internal/cluster-template-ephemeral.yaml @@ -36,19 +36,19 @@ spec: dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com name: ${CLUSTER_NAME}-api-lb - name: ${CLUSTER_NAME}-internal-lb-private-ip - privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-120.0.0.100} + privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-36.0.0.100} subnets: - cidrBlocks: - - 120.0.0.0/16 + - 36.0.0.0/16 name: control-plane-subnet role: control-plane - cidrBlocks: - - 120.1.0.0/16 + - 36.1.0.0/16 name: node-subnet role: node vnet: cidrBlocks: - - 120.0.0.0/8 + - 36.0.0.0/8 name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet} resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}} subscriptionID: ${AZURE_SUBSCRIPTION_ID} @@ -210,7 +210,7 @@ spec: cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: - - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-120.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' + - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-36.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/templates/internal/cluster-template-flatcar-sysext.yaml b/templates/internal/cluster-template-flatcar-sysext.yaml index e4190a2957a..a55926368dd 100644 --- a/templates/internal/cluster-template-flatcar-sysext.yaml +++ b/templates/internal/cluster-template-flatcar-sysext.yaml @@ -36,19 +36,19 @@ spec: dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com name: ${CLUSTER_NAME}-api-lb - name: ${CLUSTER_NAME}-internal-lb-private-ip - privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-140.0.0.100} + privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-38.0.0.100} subnets: - cidrBlocks: - - 140.0.0.0/16 + - 38.0.0.0/16 name: control-plane-subnet role: control-plane - cidrBlocks: - - 140.1.0.0/16 + - 38.1.0.0/16 name: node-subnet role: node vnet: cidrBlocks: - - 140.0.0.0/8 + - 38.0.0.0/8 name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet} resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}} subscriptionID: ${AZURE_SUBSCRIPTION_ID} @@ -323,7 +323,7 @@ spec: name: '@@HOSTNAME@@' postKubeadmCommands: [] preKubeadmCommands: - - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-140.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' + - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-38.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/templates/internal/cluster-template-flatcar.yaml b/templates/internal/cluster-template-flatcar.yaml index 432e029542c..b3a9b98a07c 100644 --- a/templates/internal/cluster-template-flatcar.yaml +++ b/templates/internal/cluster-template-flatcar.yaml @@ -36,19 +36,19 @@ spec: dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com name: ${CLUSTER_NAME}-api-lb - name: ${CLUSTER_NAME}-internal-lb-private-ip - privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-130.0.0.100} + privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-37.0.0.100} subnets: - cidrBlocks: - - 130.0.0.0/16 + - 37.0.0.0/16 name: control-plane-subnet role: control-plane - cidrBlocks: - - 130.1.0.0/16 + - 37.1.0.0/16 name: node-subnet role: node vnet: cidrBlocks: - - 130.0.0.0/8 + - 37.0.0.0/8 name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet} resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}} subscriptionID: ${AZURE_SUBSCRIPTION_ID} @@ -244,7 +244,7 @@ spec: name: '@@HOSTNAME@@' postKubeadmCommands: [] preKubeadmCommands: - - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-130.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' + - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-37.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/templates/internal/cluster-template-ipv6.yaml b/templates/internal/cluster-template-ipv6.yaml index f72897ee836..dd6bbd32e41 100644 --- a/templates/internal/cluster-template-ipv6.yaml +++ b/templates/internal/cluster-template-ipv6.yaml @@ -39,19 +39,19 @@ spec: dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com name: ${CLUSTER_NAME}-api-lb - name: ${CLUSTER_NAME}-internal-lb-private-ip - privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-150.0.0.100} + privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-39.0.0.100} subnets: - cidrBlocks: - - 150.0.0.0/16 + - 39.0.0.0/16 name: control-plane-subnet role: control-plane - cidrBlocks: - - 150.1.0.0/16 + - 39.1.0.0/16 name: node-subnet role: node vnet: cidrBlocks: - - 150.0.0.0/8 + - 39.0.0.0/8 name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet} resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}} subscriptionID: ${AZURE_SUBSCRIPTION_ID} @@ -251,5 +251,5 @@ spec: cluster-dns: '[fd00::10]' name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: - - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-150.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' + - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-39.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts diff --git a/templates/internal/cluster-template-nvidia-gpu.yaml b/templates/internal/cluster-template-nvidia-gpu.yaml index 0b2dc99e8ba..7bdd330180f 100644 --- a/templates/internal/cluster-template-nvidia-gpu.yaml +++ b/templates/internal/cluster-template-nvidia-gpu.yaml @@ -36,19 +36,19 @@ spec: dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com name: ${CLUSTER_NAME}-api-lb - name: ${CLUSTER_NAME}-internal-lb-private-ip - privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-160.0.0.100} + privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-40.0.0.100} subnets: - cidrBlocks: - - 160.0.0.0/16 + - 40.0.0.0/16 name: control-plane-subnet role: control-plane - cidrBlocks: - - 160.1.0.0/16 + - 40.1.0.0/16 name: node-subnet role: node vnet: cidrBlocks: - - 160.0.0.0/8 + - 40.0.0.0/8 name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet} resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}} subscriptionID: ${AZURE_SUBSCRIPTION_ID} @@ -219,5 +219,5 @@ spec: cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: - - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-160.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' + - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-40.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts diff --git a/templates/internal/cluster-template-private.yaml b/templates/internal/cluster-template-private.yaml index e7cc06048d5..8b0b1b938a6 100644 --- a/templates/internal/cluster-template-private.yaml +++ b/templates/internal/cluster-template-private.yaml @@ -38,7 +38,7 @@ spec: dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com name: ${CLUSTER_NAME}-api-lb - name: ${CLUSTER_NAME}-internal-lb-private-ip - privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-170.0.0.100} + privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-41.0.0.100} name: ${CLUSTER_NAME}-internal-lb type: Internal controlPlaneOutboundLB: @@ -47,16 +47,16 @@ spec: frontendIPsCount: 1 subnets: - cidrBlocks: - - 170.0.0.0/16 + - 41.0.0.0/16 name: control-plane-subnet role: control-plane - cidrBlocks: - - 170.1.0.0/16 + - 41.1.0.0/16 name: node-subnet role: node vnet: cidrBlocks: - - 170.0.0.0/8 + - 41.0.0.0/8 name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet} resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}} subscriptionID: ${AZURE_SUBSCRIPTION_ID} @@ -217,7 +217,7 @@ spec: cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: - - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-170.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' + - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-41.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/templates/internal/cluster-template-windows.yaml b/templates/internal/cluster-template-windows.yaml index acfe2d07439..1d0889e9275 100644 --- a/templates/internal/cluster-template-windows.yaml +++ b/templates/internal/cluster-template-windows.yaml @@ -40,19 +40,19 @@ spec: dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com name: ${CLUSTER_NAME}-api-lb - name: ${CLUSTER_NAME}-internal-lb-private-ip - privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-180.0.0.100} + privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-42.0.0.100} subnets: - cidrBlocks: - - 180.0.0.0/16 + - 42.0.0.0/16 name: control-plane-subnet role: control-plane - cidrBlocks: - - 180.1.0.0/16 + - 42.1.0.0/16 name: node-subnet role: node vnet: cidrBlocks: - - 180.0.0.0/8 + - 42.0.0.0/8 name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet} resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}} subscriptionID: ${AZURE_SUBSCRIPTION_ID} @@ -208,7 +208,7 @@ spec: cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: - - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-180.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' + - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-42.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 @@ -306,7 +306,7 @@ spec: - powershell C:/defender-exclude-calico.ps1 preKubeadmCommands: - powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' - -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-180.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" + -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-42.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" users: - groups: Administrators name: capi diff --git a/templates/internal/cluster-template.yaml b/templates/internal/cluster-template.yaml index 482ff968bd3..fee9a9cadac 100644 --- a/templates/internal/cluster-template.yaml +++ b/templates/internal/cluster-template.yaml @@ -36,19 +36,19 @@ spec: dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com name: ${CLUSTER_NAME}-api-lb - name: ${CLUSTER_NAME}-internal-lb-private-ip - privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-80.0.0.100} + privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-30.0.0.100} subnets: - cidrBlocks: - - 80.0.0.0/16 + - 30.0.0.0/16 name: control-plane-subnet role: control-plane - cidrBlocks: - - 80.1.0.0/16 + - 30.1.0.0/16 name: node-subnet role: node vnet: cidrBlocks: - - 80.0.0.0/8 + - 30.0.0.0/8 name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet} resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}} subscriptionID: ${AZURE_SUBSCRIPTION_ID} @@ -204,7 +204,7 @@ spec: cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: - - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-80.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' + - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-30.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/templates/internal/default/kustomization.yaml b/templates/internal/default/kustomization.yaml index 30b40e3249e..67ec81da636 100644 --- a/templates/internal/default/kustomization.yaml +++ b/templates/internal/default/kustomization.yaml @@ -13,7 +13,7 @@ patches: patch: |- - op: replace path: /spec/template/spec/preKubeadmCommands/0 - value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-80.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts + value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-30.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts options: allowResourceNotFound: true - target: @@ -21,25 +21,25 @@ patches: patch: |- - op: replace path: /spec/networkSpec/apiServerLB/frontendIPs/1/privateIP - value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-80.0.0.100} + value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-30.0.0.100} - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/vnet/cidrBlocks/0 - value: 80.0.0.0/8 + value: 30.0.0.0/8 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/0/cidrBlocks/0 - value: 80.0.0.0/16 + value: 30.0.0.0/16 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/1/cidrBlocks/0 - value: 80.1.0.0/16 + value: 30.1.0.0/16 - target: kind: KubeadmConfigTemplate name: .*-md-win @@ -47,7 +47,7 @@ patches: - op: replace path: /spec/template/spec/preKubeadmCommands/0 value: - powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-80.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" + powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-30.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" options: allowResourceNotFound: true diff --git a/templates/internal/dual-stack/kustomization.yaml b/templates/internal/dual-stack/kustomization.yaml index cc3b4ac4a1d..8b2c0753593 100644 --- a/templates/internal/dual-stack/kustomization.yaml +++ b/templates/internal/dual-stack/kustomization.yaml @@ -13,7 +13,7 @@ patches: patch: |- - op: replace path: /spec/template/spec/preKubeadmCommands/0 - value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-100.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts + value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-34.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts options: allowResourceNotFound: true - target: @@ -21,25 +21,25 @@ patches: patch: |- - op: replace path: /spec/networkSpec/apiServerLB/frontendIPs/1/privateIP - value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-100.0.0.100} + value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-34.0.0.100} - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/vnet/cidrBlocks/0 - value: 100.0.0.0/8 + value: 34.0.0.0/8 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/0/cidrBlocks/0 - value: 100.0.0.0/16 + value: 34.0.0.0/16 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/1/cidrBlocks/0 - value: 100.1.0.0/16 + value: 34.1.0.0/16 - target: kind: KubeadmConfigTemplate name: .*-md-win @@ -47,7 +47,7 @@ patches: - op: replace path: /spec/template/spec/preKubeadmCommands/0 value: - powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-100.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" + powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-34.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" options: allowResourceNotFound: true diff --git a/templates/internal/edgezone/kustomization.yaml b/templates/internal/edgezone/kustomization.yaml index 46ff5ef25c0..5f7b08b65c8 100644 --- a/templates/internal/edgezone/kustomization.yaml +++ b/templates/internal/edgezone/kustomization.yaml @@ -13,7 +13,7 @@ patches: patch: |- - op: replace path: /spec/template/spec/preKubeadmCommands/0 - value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-110.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts + value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-35.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts options: allowResourceNotFound: true - target: @@ -21,25 +21,25 @@ patches: patch: |- - op: replace path: /spec/networkSpec/apiServerLB/frontendIPs/1/privateIP - value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-110.0.0.100} + value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-35.0.0.100} - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/vnet/cidrBlocks/0 - value: 110.0.0.0/8 + value: 35.0.0.0/8 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/0/cidrBlocks/0 - value: 110.0.0.0/16 + value: 35.0.0.0/16 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/1/cidrBlocks/0 - value: 110.1.0.0/16 + value: 35.1.0.0/16 - target: kind: KubeadmConfigTemplate name: .*-md-win @@ -47,7 +47,7 @@ patches: - op: replace path: /spec/template/spec/preKubeadmCommands/0 value: - powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-110.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" + powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-35.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" options: allowResourceNotFound: true diff --git a/templates/internal/ephemeral/kustomization.yaml b/templates/internal/ephemeral/kustomization.yaml index c370fb2fd83..d542dfd78ad 100644 --- a/templates/internal/ephemeral/kustomization.yaml +++ b/templates/internal/ephemeral/kustomization.yaml @@ -13,7 +13,7 @@ patches: patch: |- - op: replace path: /spec/template/spec/preKubeadmCommands/0 - value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-120.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts + value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-36.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts options: allowResourceNotFound: true - target: @@ -21,25 +21,25 @@ patches: patch: |- - op: replace path: /spec/networkSpec/apiServerLB/frontendIPs/1/privateIP - value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-120.0.0.100} + value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-36.0.0.100} - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/vnet/cidrBlocks/0 - value: 120.0.0.0/8 + value: 36.0.0.0/8 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/0/cidrBlocks/0 - value: 120.0.0.0/16 + value: 36.0.0.0/16 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/1/cidrBlocks/0 - value: 120.1.0.0/16 + value: 36.1.0.0/16 - target: kind: KubeadmConfigTemplate name: .*-md-win @@ -47,7 +47,7 @@ patches: - op: replace path: /spec/template/spec/preKubeadmCommands/0 value: - powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-120.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" + powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-36.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" options: allowResourceNotFound: true diff --git a/templates/internal/flatcar-sysext/kustomization.yaml b/templates/internal/flatcar-sysext/kustomization.yaml index 521bdd52e6d..aaf296cd7a7 100644 --- a/templates/internal/flatcar-sysext/kustomization.yaml +++ b/templates/internal/flatcar-sysext/kustomization.yaml @@ -11,7 +11,7 @@ patches: patch: |- - op: replace path: /spec/template/spec/preKubeadmCommands/0 - value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-140.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts + value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-38.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts options: allowResourceNotFound: true - target: @@ -19,25 +19,25 @@ patches: patch: |- - op: replace path: /spec/networkSpec/apiServerLB/frontendIPs/1/privateIP - value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-140.0.0.100} + value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-38.0.0.100} - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/vnet/cidrBlocks/0 - value: 140.0.0.0/8 + value: 38.0.0.0/8 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/0/cidrBlocks/0 - value: 140.0.0.0/16 + value: 38.0.0.0/16 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/1/cidrBlocks/0 - value: 140.1.0.0/16 + value: 38.1.0.0/16 - target: kind: KubeadmConfigTemplate name: .*-md-win @@ -45,7 +45,7 @@ patches: - op: replace path: /spec/template/spec/preKubeadmCommands/0 value: - powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-140.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" + powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-38.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" options: allowResourceNotFound: true diff --git a/templates/internal/flatcar/kustomization.yaml b/templates/internal/flatcar/kustomization.yaml index 70a0b1599ff..a05b21c5c17 100644 --- a/templates/internal/flatcar/kustomization.yaml +++ b/templates/internal/flatcar/kustomization.yaml @@ -13,7 +13,7 @@ patches: patch: |- - op: replace path: /spec/template/spec/preKubeadmCommands/0 - value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-130.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts + value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-37.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts options: allowResourceNotFound: true - target: @@ -21,25 +21,25 @@ patches: patch: |- - op: replace path: /spec/networkSpec/apiServerLB/frontendIPs/1/privateIP - value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-130.0.0.100} + value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-37.0.0.100} - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/vnet/cidrBlocks/0 - value: 130.0.0.0/8 + value: 37.0.0.0/8 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/0/cidrBlocks/0 - value: 130.0.0.0/16 + value: 37.0.0.0/16 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/1/cidrBlocks/0 - value: 130.1.0.0/16 + value: 37.1.0.0/16 - target: kind: KubeadmConfigTemplate name: .*-md-win @@ -47,7 +47,7 @@ patches: - op: replace path: /spec/template/spec/preKubeadmCommands/0 value: - powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-130.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" + powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-37.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" options: allowResourceNotFound: true diff --git a/templates/internal/ipv6/kustomization.yaml b/templates/internal/ipv6/kustomization.yaml index 516be7743e7..c0789d5d816 100644 --- a/templates/internal/ipv6/kustomization.yaml +++ b/templates/internal/ipv6/kustomization.yaml @@ -13,7 +13,7 @@ patches: patch: |- - op: replace path: /spec/template/spec/preKubeadmCommands/0 - value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-150.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts + value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-39.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts options: allowResourceNotFound: true - target: @@ -21,25 +21,25 @@ patches: patch: |- - op: replace path: /spec/networkSpec/apiServerLB/frontendIPs/1/privateIP - value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-150.0.0.100} + value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-39.0.0.100} - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/vnet/cidrBlocks/0 - value: 150.0.0.0/8 + value: 39.0.0.0/8 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/0/cidrBlocks/0 - value: 150.0.0.0/16 + value: 39.0.0.0/16 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/1/cidrBlocks/0 - value: 150.1.0.0/16 + value: 39.1.0.0/16 - target: kind: KubeadmConfigTemplate name: .*-md-win @@ -47,7 +47,7 @@ patches: - op: replace path: /spec/template/spec/preKubeadmCommands/0 value: - powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-150.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" + powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-39.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" options: allowResourceNotFound: true diff --git a/templates/internal/nvidia-gpu/kustomization.yaml b/templates/internal/nvidia-gpu/kustomization.yaml index 4335100dc04..69a7bad83ca 100644 --- a/templates/internal/nvidia-gpu/kustomization.yaml +++ b/templates/internal/nvidia-gpu/kustomization.yaml @@ -13,7 +13,7 @@ patches: patch: |- - op: replace path: /spec/template/spec/preKubeadmCommands/0 - value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-160.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts + value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-40.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts options: allowResourceNotFound: true - target: @@ -21,25 +21,25 @@ patches: patch: |- - op: replace path: /spec/networkSpec/apiServerLB/frontendIPs/1/privateIP - value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-160.0.0.100} + value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-40.0.0.100} - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/vnet/cidrBlocks/0 - value: 160.0.0.0/8 + value: 40.0.0.0/8 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/0/cidrBlocks/0 - value: 160.0.0.0/16 + value: 40.0.0.0/16 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/1/cidrBlocks/0 - value: 160.1.0.0/16 + value: 40.1.0.0/16 - target: kind: KubeadmConfigTemplate name: .*-md-win @@ -47,7 +47,7 @@ patches: - op: replace path: /spec/template/spec/preKubeadmCommands/0 value: - powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-160.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" + powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-40.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" options: allowResourceNotFound: true diff --git a/templates/internal/private/kustomization.yaml b/templates/internal/private/kustomization.yaml index adc24fbc04a..c1061cf35da 100644 --- a/templates/internal/private/kustomization.yaml +++ b/templates/internal/private/kustomization.yaml @@ -13,7 +13,7 @@ patches: patch: |- - op: replace path: /spec/template/spec/preKubeadmCommands/0 - value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-170.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts + value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-41.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts options: allowResourceNotFound: true - target: @@ -21,25 +21,25 @@ patches: patch: |- - op: replace path: /spec/networkSpec/apiServerLB/frontendIPs/1/privateIP - value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-170.0.0.100} + value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-41.0.0.100} - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/vnet/cidrBlocks/0 - value: 170.0.0.0/8 + value: 41.0.0.0/8 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/0/cidrBlocks/0 - value: 170.0.0.0/16 + value: 41.0.0.0/16 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/1/cidrBlocks/0 - value: 170.1.0.0/16 + value: 41.1.0.0/16 - target: kind: KubeadmConfigTemplate name: .*-md-win @@ -47,7 +47,7 @@ patches: - op: replace path: /spec/template/spec/preKubeadmCommands/0 value: - powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-170.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" + powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-41.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" options: allowResourceNotFound: true diff --git a/templates/internal/windows/kustomization.yaml b/templates/internal/windows/kustomization.yaml index 7341b84bc2c..60ae7d87525 100644 --- a/templates/internal/windows/kustomization.yaml +++ b/templates/internal/windows/kustomization.yaml @@ -12,19 +12,19 @@ patches: patch: |- - op: replace path: /spec/networkSpec/vnet/cidrBlocks/0 - value: 180.0.0.0/8 + value: 42.0.0.0/8 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/0/cidrBlocks/0 - value: 180.0.0.0/16 + value: 42.0.0.0/16 - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/subnets/1/cidrBlocks/0 - value: 180.1.0.0/16 + value: 42.1.0.0/16 - target: kind: KubeadmConfigTemplate name: .*-md-win @@ -32,20 +32,20 @@ patches: - op: add path: /spec/template/spec/preKubeadmCommands/0 value: - powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-180.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" + powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '${AZURE_INTERNAL_LB_PRIVATE_IP:-42.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com'" - target: kind: KubeadmConfigTemplate name: .*-md-0 patch: |- - op: replace path: /spec/template/spec/preKubeadmCommands/0 - value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-180.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts + value: echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-42.0.0.100} ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts - target: kind: AzureCluster patch: |- - op: replace path: /spec/networkSpec/apiServerLB/frontendIPs/1/privateIP - value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-180.0.0.100} + value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-42.0.0.100} sortOptions: order: fifo