make private IP of the ILB configurable

kubernetes-sigs · Dec 27, 2024 · 66e5b0d · 66e5b0d
1 parent 2be2adc
commit 66e5b0d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/templates/cluster-template-apiserver-ilb.yaml b/templates/cluster-template-apiserver-ilb.yaml
diff --git a/templates/cluster-template-windows-apiserver-ilb.yaml b/templates/cluster-template-windows-apiserver-ilb.yaml
diff --git a/templates/flavors/apiserver-ilb/patches/control-plane.yaml b/templates/flavors/apiserver-ilb/patches/control-plane.yaml
@@ -13,7 +13,7 @@ spec:
             name: ${CLUSTER_NAME}-api-lb
             dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com
         - name: ${CLUSTER_NAME}-internal-lb-private-ip
-          privateIP: 30.0.0.100
+          privateIP: ${AZURE_INTERNAL_LB_PRIVATE_IP:-30.0.0.100}
     vnet:
       cidrBlocks:
         - 30.0.0.0/8

diff --git a/templates/flavors/apiserver-ilb/patches/kubeadm-config-template.yaml b/templates/flavors/apiserver-ilb/patches/kubeadm-config-template.yaml
@@ -9,4 +9,4 @@ spec:
       # This custom DNS Resolution of the API server ensures that the worker nodes can reach the API server when
       # the public IP of the API server is not accessible.
       preKubeadmCommands:
-        - echo '30.0.0.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts
+        - echo '${AZURE_INTERNAL_LB_PRIVATE_IP:-30.0.0.100}   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts
diff --git a/templates/flavors/windows-apiserver-ilb/kustomization.yaml b/templates/flavors/windows-apiserver-ilb/kustomization.yaml
@@ -14,13 +14,13 @@ patches:
     patch: |-
       - op: replace
         path: /spec/template/spec/preKubeadmCommands/0
-        value: echo '40.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
   - target:
       kind: AzureCluster
     patch: |-
       - op: replace
         path: /spec/networkSpec/apiServerLB/frontendIPs/1/privateIP
-        value: 40.0.11.100
+        value: ${AZURE_INTERNAL_LB_PRIVATE_IP:-40.0.0.100}
   - target:
       kind: AzureCluster
     patch: |-
@@ -46,7 +46,7 @@ patches:
       - op: replace
         path: /spec/template/spec/preKubeadmCommands/0
         value:
-          powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '40.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'"
 
 sortOptions:
   order: fifo
diff --git a/templates/flavors/windows-apiserver-ilb/patches/kubeadm-config-template.yaml b/templates/flavors/windows-apiserver-ilb/patches/kubeadm-config-template.yaml
@@ -9,4 +9,4 @@ spec:
       # so that worker nodes can access the API server using the internal IP.
       # 10.0.0.100 is the default IP that gets assigned to a internal load balancer.
       preKubeadmCommands:
-        - powershell -Command "Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '10.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'"