Merge pull request #1662 from FloatXD/e2e-24

[Test]upgrade kube_version to 1.32.9

Author: ErikJiang

.github/workflows/verify-kubespray.yaml

@@ -80,7 +80,7 @@ jobs:
           echo ${{ runner.os }}
           echo ${{ runner.arch }}
           echo ${{ github.workspace }}
-          export KUBE_VERSION=1.31.6
+          export KUBE_VERSION=1.32.9
           bash hack/e2e.sh "${HELM_CHART_VERSION}" "${CONTAINER_TAG}" ${{ runner.name }} "${VSPHERE_USER}" "${VSPHERE_PASSWD}" "${AMD_ROOT_PASSWORD}" "${KYLIN_VM_PASSWORD}" "PR"
 
   print_kubespray_commit_sha:

examples/install/2.mirror/VarsConfCM.yml

@@ -9,7 +9,7 @@ metadata:
 data:
   group_vars.yml: |
     kube_owner: root
-    kube_version: "1.31.6"
+    kube_version: "1.32.9"
     container_manager: containerd
     k8s_image_pull_policy: IfNotPresent
     kube_network_plugin: calico

examples/install/3.airgap/VarsConfCM.yml

@@ -9,7 +9,7 @@ metadata:
 data:
   group_vars.yml: |
     kube_owner: root
-    kube_version: "1.31.6"
+    kube_version: "1.32.9"
     
     registry_host: "<REGISTRY_HOST>:<REGISTRY_PORT>"
     minio_address: "http://<MINIO_API_HOST>:<MINIO_API_PORT>"

hack/run-nightly-cluster-e2e.sh

@@ -146,7 +146,7 @@ func_prepare_config_yaml "${SOURCE_CONFIG_PATH}"  "${dest_config_path}"
 CLUSTER_OPERATION_NAME1="cluster1-install-"`date "+%H-%M-%S"`
 
 # set vars-conf-cm.yml
-sed -i "s/1.31.6/1.31.6/"  "${dest_config_path}"/vars-conf-cm.yml
+sed -i "s/1.32.9/1.32.0/"  "${dest_config_path}"/vars-conf-cm.yml
 
 sed -i "s/e2e-cluster1-install/${CLUSTER_OPERATION_NAME1}/"  "${dest_config_path}"/kubeanClusterOps.yml
 
@@ -157,15 +157,15 @@ func_prepare_config_yaml "${SOURCE_CONFIG_PATH}"  "${dest_config_path}"
 CLUSTER_OPERATION_NAME2="cluster1-upgrade-y"
 sed -i "s/e2e-cluster1-install/${CLUSTER_OPERATION_NAME2}/"  "${dest_config_path}"/kubeanClusterOps.yml
 sed -i "s/cluster.yml/upgrade-cluster.yml/" "${dest_config_path}"/kubeanClusterOps.yml
-sed -i "s/1.31.6/1.31.9/"  "${dest_config_path}"/vars-conf-cm.yml
+sed -i "s/1.32.9/1.32.9/"  "${dest_config_path}"/vars-conf-cm.yml
 
 ## prepare cluster upgrade job yml --> upgrade from v1.31.9 to v1.32.1
 dest_config_path="${REPO_ROOT}"/test/kubean_sonobouy_nightlye2e/e2e-upgrade-cluster-z/
 func_prepare_config_yaml "${SOURCE_CONFIG_PATH}"  "${dest_config_path}"
 CLUSTER_OPERATION_NAME3="cluster1-upgrade-z"
 sed -i "s/e2e-cluster1-install/${CLUSTER_OPERATION_NAME3}/"  "${dest_config_path}"/kubeanClusterOps.yml
 sed -i "s/cluster.yml/upgrade-cluster.yml/" "${dest_config_path}"/kubeanClusterOps.yml
-sed -i "s/1.31.6/1.32.1/"  "${dest_config_path}"/vars-conf-cm.yml
+sed -i "s/1.32.9/1.33.0/"  "${dest_config_path}"/vars-conf-cm.yml
 
 ginkgo -v -race -timeout=6h --fail-fast ./test/kubean_sonobouy_nightlye2e/  -- --kubeconfig="${KUBECONFIG_FILE}" \
           --clusterOperationName="${CLUSTER_OPERATION_NAME1}"  --vmipaddr="${vm_ip_addr1}" --vmipaddr2="${vm_ip_addr2}" \

hack/yml_utils.sh

@@ -77,7 +77,7 @@ function yamlUtil::abstract_groupVars() {
     yq -i '.metrics_server_enabled = "true"'  $groupVarYml
     yq -i '.local_path_provisioner_enabled = "true"'  $groupVarYml
     yq -i '.kubeadm_init_timeout = "600s"'  $groupVarYml
-    yq -i '.kube_version = "1.31.6"'  $groupVarYml
+    yq -i '.kube_version = "1.32.9"'  $groupVarYml
 }
 
 function yamlUtil::update_groupVars() {

test/common/vars-conf-cm.yml

@@ -8,7 +8,7 @@ data:
     # k8s-cluster
     kube_owner: root
     unsafe_show_logs: true
-    kube_version: "1.31.6"
+    kube_version: "1.32.9"
     container_manager: containerd
     k8s_image_pull_policy: IfNotPresent
     kube_network_plugin: calico

test/offline-common/vars-conf-cm.yml

@@ -41,7 +41,7 @@ data:
     # github image repo define (ex multus only use that)
     github_image_repo: "{{registry_host}}/ghcr.io"
     # k8s-cluster
-    kube_version: "1.31.6"
+    kube_version: "1.32.9"
     container_manager: containerd
     k8s_image_pull_policy: IfNotPresent
     kube_network_plugin: calico

test/tools/config.go

@@ -32,9 +32,9 @@ const (
 )
 
 const (
-	OriginK8Version             = "v1.31.6"
-	UpgradeK8Version_Y          = "v1.31.9"
-	UpgradeK8Version_Z          = "v1.32.1"
+	OriginK8Version             = "v1.32.0"
+	UpgradeK8Version_Y          = "v1.32.9"
+	UpgradeK8Version_Z          = "v1.33.0"
 	NginxAlpha                  = "release-ci.daocloud.io/kubean/nginx:alpine"
 	E2eInstallClusterYamlFolder = "e2e-install-cluster"
 )