update ci templates attempt 2

kubernetes-sigs · Nov 19, 2024 · a9dbe5f · a9dbe5f
1 parent dd27c47
commit a9dbe5f
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 53 deletions.
diff --git a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml
diff --git a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml
diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml
diff --git a/templates/test/ci/cluster-template-prow-private.yaml b/templates/test/ci/cluster-template-prow-private.yaml
diff --git a/templates/test/ci/cluster-template-prow-spot.yaml b/templates/test/ci/cluster-template-prow-spot.yaml
diff --git a/templates/test/ci/prow-ci-version-dual-stack/kustomization.yaml b/templates/test/ci/prow-ci-version-dual-stack/kustomization.yaml
@@ -33,7 +33,7 @@ patches:
   patch: |-
     - op: add
       path: /spec/template/spec/preKubeadmCommands/-
-      value: echo '50.0.0.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts
+      value: echo '10.0.11.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts
 
 
 sortOptions:

diff --git a/templates/test/ci/prow-ci-version-ipv6/kustomization.yaml b/templates/test/ci/prow-ci-version-ipv6/kustomization.yaml
@@ -28,6 +28,13 @@ patches:
 - path: ../prow-ipv6/patches/cluster-label-calico-ipv6.yaml
 - path: patches/machine-deployment.yaml
 - path: ../patches/windows-addons-disabled.yaml
+- target:
+    kind: KubeadmConfigTemplate
+  patch: |-
+    - op: add
+      path: /spec/template/spec/preKubeadmCommands/-
+      value: echo '10.0.11.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts
+
 
 sortOptions:
   order: fifo
diff --git a/templates/test/ci/prow-custom-vnet/kustomization.yaml b/templates/test/ci/prow-custom-vnet/kustomization.yaml
@@ -22,19 +22,19 @@ patches:
   patch: |-
     - op: add
       path: /spec/template/spec/preKubeadmCommands/-
-      value: echo '10.13.0.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts
+      value: echo '10.0.11.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: 10.13.0.100
+      value: 10.0.11.100
 - target:
     kind: AzureCluster
   patch: |-
     - op: replace
       path: /spec/networkSpec/vnet/cidrBlocks/0
-      value: 10.13.0.0/16
+      value: 10.0.0.0/8
 - target:
     kind: AzureCluster
   patch: |-
@@ -43,7 +43,7 @@ patches:
       value: []
     - op: add
       path: /spec/networkSpec/subnets/0/cidrBlocks/0
-      value: 10.13.0.0/24
+      value: 10.0.0.0/16
 - target:
     kind: AzureCluster
   patch: |-
@@ -52,7 +52,7 @@ patches:
       value: []
     - op: add
       path: /spec/networkSpec/subnets/1/cidrBlocks/0
-      value: 10.13.1.0/24
+      value: 10.1.0.0/16
 - target:
     kind: KubeadmConfigTemplate
   patch: |-

diff --git a/templates/test/ci/prow-private/kustomization.yaml b/templates/test/ci/prow-private/kustomization.yaml
@@ -20,6 +20,16 @@ patches:
 - path: ../patches/uami-control-plane.yaml
 - path: ../patches/cluster-label-calico.yaml
 - path: ../patches/cluster-label-cloud-provider-azure.yaml
+# we need to add the default private IP to the hosts file of the worker nodes
+- target:
+    kind: KubeadmConfigTemplate
+  patch: |-
+    - op: remove
+      path: /spec/template/spec/preKubeadmCommands/0
+    - op: add
+      path: /spec/template/spec/preKubeadmCommands/-
+      value: echo '10.0.0.100   ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com' >> /etc/hosts
+
 configMapGenerator:
 - files:
   - resources=../../../addons/calico.yaml

diff --git a/templates/test/ci/prow-spot/kustomization.yaml b/templates/test/ci/prow-spot/kustomization.yaml
@@ -17,41 +17,6 @@ patches:
 - path: ../patches/uami-control-plane.yaml
 - path: ../patches/cluster-label-calico.yaml
 - path: ../patches/cluster-label-cloud-provider-azure.yaml
-- target:
-    kind: KubeadmConfigTemplate
-  patch: |-
-    - op: add
-      path: /spec/template/spec/preKubeadmCommands/-
-      value: echo '10.12.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: 10.12.0.100
-- target:
-    kind: AzureCluster
-  patch: |-
-    - op: replace
-      path: /spec/networkSpec/vnet/cidrBlocks/0
-      value: 10.12.0.0/16
-- target:
-    kind: AzureCluster
-  patch: |-
-    - op: replace
-      path: /spec/networkSpec/subnets/0/cidrBlocks/0
-      value: 10.12.0.0/24
-- target:
-    kind: AzureCluster
-  patch: |-
-    - op: replace
-      path: /spec/networkSpec/subnets/1/cidrBlocks/0
-      value: 10.12.1.0/24
-- target:
-    kind: KubeadmConfigTemplate
-  patch: |-
-    - op: remove
-      path: /spec/template/spec/preKubeadmCommands/0
 
 sortOptions:
   order: fifo