Change interface names for predicatable ones for centos

Sunnatillo · Sunnatillo · commit c0c7560f13bc · 2025-09-23T15:15:23.000+03:00
Signed-off-by: Sunnatillo &lt;sunnat.samadov@est.tech&gt;
diff --git a/docs/dev-setup.md b/docs/dev-setup.md
@@ -287,7 +287,7 @@ Please note, the precedence of variables is as follows:
         },
         "metadata": {,
             "CONTROL_PLANE_MACHINE_COUNT": "1",
-            "KUBERNETES_VERSION": "v1.32.0",
+            "KUBERNETES_VERSION": "v1.32.9",
             "WORKER_MACHINE_COUNT": "2",
         }
     }
diff --git a/examples/generate.sh b/examples/generate.sh
@@ -24,11 +24,11 @@ KUSTOMIZE="${SOURCE_DIR}/../hack/tools/bin/kustomize"
 
 # Cluster.
 export CLUSTER_NAME="${CLUSTER_NAME:-test1}"
-export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.32.0}"
+export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.32.9}"
 export CLUSTER_APIENDPOINT_HOST="${CLUSTER_APIENDPOINT_HOST:-192.168.111.249}"
 export CLUSTER_APIENDPOINT_PORT="${CLUSTER_APIENDPOINT_PORT:-6443}"
-export IMAGE_URL="${IMAGE_URL:-http://172.22.0.1/images/UBUNTU_24.04_NODE_IMAGE_K8S_v1.32.0-raw.img}"
-export IMAGE_CHECKSUM="${IMAGE_CHECKSUM:-http://172.22.0.1/images/UBUNTU_24.04_NODE_IMAGE_K8S_v1.32.0-raw.img.sha256sum}"
+export IMAGE_URL="${IMAGE_URL:-http://172.22.0.1/images/UBUNTU_24.04_NODE_IMAGE_K8S_v1.32.9-raw.img}"
+export IMAGE_CHECKSUM="${IMAGE_CHECKSUM:-http://172.22.0.1/images/UBUNTU_24.04_NODE_IMAGE_K8S_v1.32.9-raw.img.sha256sum}"
 export IMAGE_CHECKSUM_TYPE="${IMAGE_CHECKSUM_TYPE:-sha256}"
 export IMAGE_FORMAT="${IMAGE_FORMAT:-raw}"
 
diff --git a/hack/ensure-kubectl.sh b/hack/ensure-kubectl.sh
@@ -19,7 +19,7 @@ set -o nounset
 set -o pipefail
 
 GOPATH_BIN="$(go env GOPATH)/bin/"
-MINIMUM_KUBECTL_VERSION=${KUBERNETES_VERSION:-"v1.32.0"}
+MINIMUM_KUBECTL_VERSION=${KUBERNETES_VERSION:-"v1.32.9"}
 
 # Ensure the kubectl tool exists and is a viable version, or installs it
 verify_kubectl_version()
diff --git a/hack/gen_tilt_settings.sh b/hack/gen_tilt_settings.sh
@@ -50,7 +50,7 @@ cat <<EOF >tilt-settings.json
 {
     "capi_version": "${CAPIRELEASE}",
     "cert_manager_version": "v1.12.3",
-    "kubernetes_version": "${KUBERNETES_VERSION:-v1.29.0}",
+    "kubernetes_version": "${KUBERNETES_VERSION:-v1.32.9}",
     "extra_args": {
         "feature_gates": {
             "ClusterTopology": "true"
@@ -63,7 +63,7 @@ cat <<EOF >tilt-settings.json
 {
     "capi_version": "${CAPIRELEASE}",
     "cert_manager_version": "v1.12.3",
-    "kubernetes_version": "${KUBERNETES_VERSION:-v1.32.0}"
+    "kubernetes_version": "${KUBERNETES_VERSION:-v1.32.9}"
 }
 EOF
 fi
diff --git a/scripts/environment.sh b/scripts/environment.sh
@@ -48,8 +48,8 @@ else
   export EPHEMERAL_CLUSTER="minikube"
 fi
 
-export FROM_K8S_VERSION=${FROM_K8S_VERSION:-"v1.31.2"}
-export KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.32.0"}
+export FROM_K8S_VERSION=${FROM_K8S_VERSION:-"v1.31.13"}
+export KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.32.9"}
 
 # Can be overriden from jjbs
 export CAPI_VERSION=${CAPI_VERSION:-"v1beta1"}
diff --git a/test/e2e/config/e2e_conf.yaml b/test/e2e/config/e2e_conf.yaml
@@ -202,12 +202,12 @@ providers:
 
 variables:
   CNI: "/tmp/calico.yaml"
-  KUBERNETES_VERSION: "v1.32.0"
+  KUBERNETES_VERSION: "v1.32.9"
   # KUBERNETES_PATCH_FROM_VERSION and KUBERNETES_PATCH_TO_VERSION are used to
   # test upgrade scenarios where we only want to upgrade the patch version of
   # kubernetes.
-  KUBERNETES_PATCH_FROM_VERSION: "v1.31.0"
-  KUBERNETES_PATCH_TO_VERSION: "v1.31.2"
+  KUBERNETES_PATCH_FROM_VERSION: "v1.32.8"
+  KUBERNETES_PATCH_TO_VERSION: "v1.32.9"
   CONTROL_PLANE_MACHINE_COUNT: 3
   WORKER_MACHINE_COUNT: 1
   NUM_NODES: 4
diff --git a/test/e2e/data/infrastructure-metal3/bases/centos-kubeadm-config/centos-kubeadm-config.yaml b/test/e2e/data/infrastructure-metal3/bases/centos-kubeadm-config/centos-kubeadm-config.yaml
@@ -48,7 +48,7 @@ spec:
 
         vrrp_instance VI_1 {
             state MASTER
-            interface eth1
+            interface enp2s0
             virtual_router_id 1
             priority 101
             advert_int 1
@@ -59,14 +59,14 @@ spec:
                 k8s_api_check
             }
         }
-    - path: /etc/NetworkManager/system-connections/eth0.nmconnection
+    - path: /etc/NetworkManager/system-connections/enp1s0.nmconnection
       owner: root:root
       permissions: '0600'
       content: |
         [connection]
-        id=eth0
+        id=enp1s0
         type=ethernet
-        interface-name=eth0
+        interface-name=enp1s0
         master=ironicendpoint
         slave-type=bridge
     - content: |
@@ -135,8 +135,8 @@ spec:
       - systemctl restart NetworkManager.service
       - nmcli connection load /etc/NetworkManager/system-connections/ironicendpoint.nmconnection
       - nmcli connection up ironicendpoint
-      - nmcli connection load /etc/NetworkManager/system-connections/eth0.nmconnection
-      - nmcli connection up eth0
+      - nmcli connection load /etc/NetworkManager/system-connections/enp1s0.nmconnection
+      - nmcli connection up enp1s0
       - systemctl enable --now keepalived
       - sleep 60
       - systemctl enable --now crio kubelet
@@ -176,14 +176,14 @@ spec:
         permissions: "0755"
       - content: |
           [connection]
-          id=eth0
+          id=enp1s0
           type=ethernet
-          interface-name=eth0
+          interface-name=enp1s0
           master=ironicendpoint
           slave-type=bridge
           autoconnect=yes
           autoconnect-priority=999
-        path: /etc/NetworkManager/system-connections/eth0.nmconnection
+        path: /etc/NetworkManager/system-connections/enp1s0.nmconnection
         owner: root:root
         permissions: '0600'
       - path: /etc/NetworkManager/system-connections/ironicendpoint.nmconnection
@@ -230,7 +230,7 @@ spec:
       - systemctl restart NetworkManager.service
       - nmcli connection load /etc/NetworkManager/system-connections/ironicendpoint.nmconnection
       - nmcli connection up ironicendpoint
-      - nmcli connection load /etc/NetworkManager/system-connections/eth0.nmconnection
-      - nmcli connection up eth0
+      - nmcli connection load /etc/NetworkManager/system-connections/enp1s0.nmconnection
+      - nmcli connection up enp1s0
       - systemctl enable --now crio kubelet
       - sleep 120
diff --git a/test/e2e/data/infrastructure-metal3/bases/clusterclass-centos-kubeadm-config/clusterclass-centos-kubeadm-config.yaml b/test/e2e/data/infrastructure-metal3/bases/clusterclass-centos-kubeadm-config/clusterclass-centos-kubeadm-config.yaml
@@ -56,7 +56,7 @@ spec:
 
             vrrp_instance VI_1 {
                 state MASTER
-                interface eth1
+                interface enp2s0
                 virtual_router_id 1
                 priority 101
                 advert_int 1
@@ -67,14 +67,14 @@ spec:
                     k8s_api_check
                 }
             }
-        - path: /etc/NetworkManager/system-connections/eth0.nmconnection
+        - path: /etc/NetworkManager/system-connections/enp1s0.nmconnection
           owner: root:root
           permissions: '0600'
           content: |
             [connection]
-            id=eth0
+            id=enp1s0
             type=ethernet
-            interface-name=eth0
+            interface-name=enp1s0
             master=ironicendpoint
             slave-type=bridge
         - content: |
@@ -143,8 +143,8 @@ spec:
           - systemctl restart NetworkManager.service
           - nmcli connection load /etc/NetworkManager/system-connections/ironicendpoint.nmconnection
           - nmcli connection up ironicendpoint
-          - nmcli connection load /etc/NetworkManager/system-connections/eth0.nmconnection
-          - nmcli connection up eth0
+          - nmcli connection load /etc/NetworkManager/system-connections/enp1s0.nmconnection
+          - nmcli connection up enp1s0
           - systemctl enable --now keepalived
           - sleep 60
           - systemctl enable --now crio kubelet
@@ -184,14 +184,14 @@ spec:
         permissions: "0755"
       - content: |
           [connection]
-          id=eth0
+          id=enp1s0
           type=ethernet
-          interface-name=eth0
+          interface-name=enp1s0
           master=ironicendpoint
           slave-type=bridge
           autoconnect=yes
           autoconnect-priority=999
-        path: /etc/NetworkManager/system-connections/eth0.nmconnection
+        path: /etc/NetworkManager/system-connections/enp1s0.nmconnection
         owner: root:root
         permissions: '0600'
       - path: /etc/NetworkManager/system-connections/ironicendpoint.nmconnection
@@ -238,7 +238,7 @@ spec:
       - systemctl restart NetworkManager.service
       - nmcli connection load /etc/NetworkManager/system-connections/ironicendpoint.nmconnection
       - nmcli connection up ironicendpoint
-      - nmcli connection load /etc/NetworkManager/system-connections/eth0.nmconnection
-      - nmcli connection up eth0
+      - nmcli connection load /etc/NetworkManager/system-connections/enp1s0.nmconnection
+      - nmcli connection up enp1s0
       - systemctl enable --now crio kubelet
       - sleep 120
diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -185,11 +185,8 @@ func CreateClusterctlLocalRepository(config *clusterctl.E2EConfig, repositoryFol
 	// Ensuring a CNI file is defined in the config and register a FileTransformation to inject the referenced file as in place of the CNI_RESOURCES envSubst variable.
 	Expect(config.Variables).To(HaveKey(capi_e2e.CNIPath), "Missing %s variable in the config", capi_e2e.CNIPath)
 	cniPath := config.GetVariable(capi_e2e.CNIPath)
-	if osType == "centos" {
-		updateCalico(config, cniPath, "eth1")
-	} else {
-		updateCalico(config, cniPath, "enp2s0")
-	}
+	updateCalico(config, cniPath, "enp2s0")
+
 	Expect(cniPath).To(BeAnExistingFile(), "The %s variable should resolve to an existing file", capi_e2e.CNIPath)
 	createRepositoryInput.RegisterClusterResourceSetConfigMapTransformation(cniPath, capi_e2e.CNIResources)
 
diff --git a/test/e2e/scalability_test.go b/test/e2e/scalability_test.go
@@ -62,7 +62,7 @@ var _ = Describe("When testing scalability with fakeIPA and FKAS [scalability]",
 		// We need to override clusterctl apply log folder to avoid getting our credentials exposed.
 		clusterctlLogFolder = filepath.Join(os.TempDir(), "clusters", bootstrapClusterProxy.GetName())
 		createFKASResources()
-		imageURL, imageChecksum := EnsureImage("v1.30.0")
+		imageURL, imageChecksum := EnsureImage("v1.30.14")
 		os.Setenv("IMAGE_RAW_CHECKSUM", imageChecksum)
 		os.Setenv("IMAGE_RAW_URL", imageURL)
 	})
diff --git a/test/e2e/upgrade_clusterctl_test.go b/test/e2e/upgrade_clusterctl_test.go
@@ -34,7 +34,7 @@ var _ = Describe("When testing cluster upgrade from releases (v1.8=>current) [cl
 		osType := strings.ToLower(os.Getenv("OS"))
 		Expect(osType).ToNot(Equal(""))
 		validateGlobals(specName)
-		imageURL, imageChecksum := EnsureImage("v1.32.0")
+		imageURL, imageChecksum := EnsureImage("v1.32.9")
 		os.Setenv("IMAGE_RAW_CHECKSUM", imageChecksum)
 		os.Setenv("IMAGE_RAW_URL", imageURL)
 		// We need to override clusterctl apply log folder to avoid getting our credentials exposed.
@@ -58,8 +58,8 @@ var _ = Describe("When testing cluster upgrade from releases (v1.8=>current) [cl
 			InitWithBootstrapProviders:      []string{fmt.Sprintf(providerKubeadmPrefix, capiStableRelease)},
 			InitWithControlPlaneProviders:   []string{fmt.Sprintf(providerKubeadmPrefix, capiStableRelease)},
 			InitWithInfrastructureProviders: []string{fmt.Sprintf(providerMetal3Prefix, capm3StableRelease)},
-			InitWithKubernetesVersion:       "v1.32.0",
-			WorkloadKubernetesVersion:       "v1.32.0",
+			InitWithKubernetesVersion:       "v1.32.9",
+			WorkloadKubernetesVersion:       "v1.32.9",
 			InitWithBinary:                  fmt.Sprintf(clusterctlDownloadURL, capiStableRelease),
 			PreInit: func(clusterProxy framework.ClusterProxy) {
 				preInitFunc(clusterProxy, "0.8", "26.0")
@@ -86,7 +86,7 @@ var _ = Describe("When testing cluster upgrade from releases (v1.7=>current) [cl
 		osType := strings.ToLower(os.Getenv("OS"))
 		Expect(osType).ToNot(Equal(""))
 		validateGlobals(specName)
-		imageURL, imageChecksum := EnsureImage("v1.30.0")
+		imageURL, imageChecksum := EnsureImage("v1.30.14")
 		os.Setenv("IMAGE_RAW_CHECKSUM", imageChecksum)
 		os.Setenv("IMAGE_RAW_URL", imageURL)
 		// We need to override clusterctl apply log folder to avoid getting our credentials exposed.
@@ -110,8 +110,8 @@ var _ = Describe("When testing cluster upgrade from releases (v1.7=>current) [cl
 			InitWithBootstrapProviders:      []string{fmt.Sprintf(providerKubeadmPrefix, capiStableRelease)},
 			InitWithControlPlaneProviders:   []string{fmt.Sprintf(providerKubeadmPrefix, capiStableRelease)},
 			InitWithInfrastructureProviders: []string{fmt.Sprintf(providerMetal3Prefix, capm3StableRelease)},
-			InitWithKubernetesVersion:       "v1.30.0",
-			WorkloadKubernetesVersion:       "v1.30.0",
+			InitWithKubernetesVersion:       "v1.30.14",
+			WorkloadKubernetesVersion:       "v1.30.14",
 			InitWithBinary:                  fmt.Sprintf(clusterctlDownloadURL, capiStableRelease),
 			PreInit: func(clusterProxy framework.ClusterProxy) {
 				preInitFunc(clusterProxy, "0.6", "25.0")

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ Please note, the precedence of variables is as follows:`
`287`	`287`	`},`
`288`	`288`	`"metadata": {,`
`289`	`289`	`"CONTROL_PLANE_MACHINE_COUNT": "1",`
`290`		`- "KUBERNETES_VERSION": "v1.32.0",`
	`290`	`+ "KUBERNETES_VERSION": "v1.32.9",`
`291`	`291`	`"WORKER_MACHINE_COUNT": "2",`
`292`	`292`	`}`
`293`	`293`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ cat <<EOF >tilt-settings.json`
`50`	`50`	`{`
`51`	`51`	`"capi_version": "${CAPIRELEASE}",`
`52`	`52`	`"cert_manager_version": "v1.12.3",`
`53`		`- "kubernetes_version": "${KUBERNETES_VERSION:-v1.29.0}",`
	`53`	`+ "kubernetes_version": "${KUBERNETES_VERSION:-v1.32.9}",`
`54`	`54`	`"extra_args": {`
`55`	`55`	`"feature_gates": {`
`56`	`56`	`"ClusterTopology": "true"`
`@@ -63,7 +63,7 @@ cat <<EOF >tilt-settings.json`
`63`	`63`	`{`
`64`	`64`	`"capi_version": "${CAPIRELEASE}",`
`65`	`65`	`"cert_manager_version": "v1.12.3",`
`66`		`- "kubernetes_version": "${KUBERNETES_VERSION:-v1.32.0}"`
	`66`	`+ "kubernetes_version": "${KUBERNETES_VERSION:-v1.32.9}"`
`67`	`67`	`}`
`68`	`68`	`EOF`
`69`	`69`	`fi`