diff --git a/hack/run-nightly-cluster-e2e.sh b/hack/run-nightly-cluster-e2e.sh index a0d3c202f..6a10fcd60 100644 --- a/hack/run-nightly-cluster-e2e.sh +++ b/hack/run-nightly-cluster-e2e.sh @@ -139,21 +139,21 @@ CLUSTER_OPERATION_NAME1="cluster1-install-"`date "+%H-%M-%S"` sed -i "s/e2e-cluster1-install/${CLUSTER_OPERATION_NAME1}/" "${dest_config_path}"/kubeanClusterOps.yml -## prepare cluster upgrade job yml --> upgrade from v1.26.0 to v1.26.7 +## prepare cluster upgrade job yml --> upgrade from v1.27.0 to v1.28.0 dest_config_path="${REPO_ROOT}"/test/kubean_sonobouy_nightlye2e/e2e-upgrade-cluster-y/ 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/v1.26.0/v1.26.7/" "${dest_config_path}"/vars-conf-cm.yml +sed -i "s/v1.27.0/v1.28.0/" "${dest_config_path}"/vars-conf-cm.yml -## prepare cluster upgrade job yml --> upgrade from v1.26.0 to v1.27.1 +## prepare cluster upgrade job yml --> upgrade from v1.27.0 to v1.27.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/v1.26.0/v1.27.1/" "${dest_config_path}"/vars-conf-cm.yml +sed -i "s/v1.27.0/v1.27.1/" "${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}" \ diff --git a/hack/yml_utils.sh b/hack/yml_utils.sh index 159f25522..b83050876 100644 --- a/hack/yml_utils.sh +++ b/hack/yml_utils.sh @@ -76,7 +76,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 = "v1.26.0"' $groupVarYml + yq -i '.kube_version = "v1.27.0"' $groupVarYml } function yamlUtil::update_groupVars() { diff --git a/test/common/vars-conf-cm.yml b/test/common/vars-conf-cm.yml index 0c08c65b6..a3bf4f71c 100644 --- a/test/common/vars-conf-cm.yml +++ b/test/common/vars-conf-cm.yml @@ -7,7 +7,7 @@ data: group_vars.yml: | # k8s-cluster unsafe_show_logs: true - kube_version: "v1.26.0" + kube_version: "v1.27.0" container_manager: containerd k8s_image_pull_policy: IfNotPresent kube_network_plugin: calico diff --git a/test/tools/config.go b/test/tools/config.go index 749e078c3..4c66d2161 100644 --- a/test/tools/config.go +++ b/test/tools/config.go @@ -32,8 +32,8 @@ const ( ) const ( - OriginK8Version = "v1.26.0" - UpgradeK8Version_Y = "v1.26.7" + OriginK8Version = "v1.27.0" + UpgradeK8Version_Y = "v1.28.0" UpgradeK8Version_Z = "v1.27.1" NginxAlpha = "release-ci.daocloud.io/kubean/nginx:alpine" E2eInstallClusterYamlFolder = "e2e-install-cluster"