From 8ee184cf2050afadc8a36e9dae7a94a49e9e08f8 Mon Sep 17 00:00:00 2001 From: "panyintian.fu" Date: Mon, 9 Sep 2024 15:18:54 +0800 Subject: [PATCH] [Test]update kube_version in e2e test Signed-off-by: panyintian.fu --- .github/workflows/verify-kubespray.yaml | 2 +- hack/run-nightly-cluster-e2e.sh | 10 +++++----- hack/yml_utils.sh | 2 +- test/common/vars-conf-cm.yml | 2 +- test/offline-common/vars-conf-cm.yml | 2 +- test/tools/config.go | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/verify-kubespray.yaml b/.github/workflows/verify-kubespray.yaml index 6f8133857..1ae71779b 100644 --- a/.github/workflows/verify-kubespray.yaml +++ b/.github/workflows/verify-kubespray.yaml @@ -80,7 +80,7 @@ jobs: echo ${{ runner.os }} echo ${{ runner.arch }} echo ${{ github.workspace }} - export KUBE_VERSION=v1.29.5 + export KUBE_VERSION=v1.30.4 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: diff --git a/hack/run-nightly-cluster-e2e.sh b/hack/run-nightly-cluster-e2e.sh index 7fd3093ef..07eabe9b7 100644 --- a/hack/run-nightly-cluster-e2e.sh +++ b/hack/run-nightly-cluster-e2e.sh @@ -140,26 +140,26 @@ 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/v1.29.5/v1.28.9/" "${dest_config_path}"/vars-conf-cm.yml +sed -i "s/v1.30.4/v1.29.5/" "${dest_config_path}"/vars-conf-cm.yml sed -i "s/e2e-cluster1-install/${CLUSTER_OPERATION_NAME1}/" "${dest_config_path}"/kubeanClusterOps.yml -## prepare cluster upgrade job yml --> upgrade from v1.28.9 to v1.29.0 +## prepare cluster upgrade job yml --> upgrade from v1.29.5 to v1.30.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.29.5/v1.29.0/" "${dest_config_path}"/vars-conf-cm.yml +sed -i "s/v1.30.4/v1.30.0/" "${dest_config_path}"/vars-conf-cm.yml -## prepare cluster upgrade job yml --> upgrade from v1.29.0 to v1.29.5 +## prepare cluster upgrade job yml --> upgrade from v1.30.0 to v1.30.4 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.29.5/v1.29.5/" "${dest_config_path}"/vars-conf-cm.yml +sed -i "s/v1.30.4/v1.30.4/" "${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 b17c12422..4a329a306 100644 --- a/hack/yml_utils.sh +++ b/hack/yml_utils.sh @@ -75,7 +75,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.29.5"' $groupVarYml + yq -i '.kube_version = "v1.30.4"' $groupVarYml } function yamlUtil::update_groupVars() { diff --git a/test/common/vars-conf-cm.yml b/test/common/vars-conf-cm.yml index 93bdcc143..98be46688 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.29.5" + kube_version: "v1.30.4" container_manager: containerd k8s_image_pull_policy: IfNotPresent kube_network_plugin: calico diff --git a/test/offline-common/vars-conf-cm.yml b/test/offline-common/vars-conf-cm.yml index 0bbf5e030..24cc7f963 100644 --- a/test/offline-common/vars-conf-cm.yml +++ b/test/offline-common/vars-conf-cm.yml @@ -40,7 +40,7 @@ data: # github image repo define (ex multus only use that) github_image_repo: "{{registry_host}}/ghcr.io" # k8s-cluster - kube_version: "v1.29.5" + kube_version: "v1.30.4" 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 748ce7ab9..355d52ec7 100644 --- a/test/tools/config.go +++ b/test/tools/config.go @@ -32,9 +32,9 @@ const ( ) const ( - OriginK8Version = "v1.28.9" - UpgradeK8Version_Y = "v1.29.0" - UpgradeK8Version_Z = "v1.29.5" + OriginK8Version = "v1.29.5" + UpgradeK8Version_Y = "v1.30.0" + UpgradeK8Version_Z = "v1.30.4" NginxAlpha = "release-ci.daocloud.io/kubean/nginx:alpine" E2eInstallClusterYamlFolder = "e2e-install-cluster" )