Skip to content

Commit

Permalink
Merge pull request #1108 from Rei1010/bumpKubeanVersion
Browse files Browse the repository at this point in the history
Bump default E2E Kubernetes version
  • Loading branch information
ErikJiang authored Feb 4, 2024
2 parents bd5812a + b1ae19a commit b961488
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions hack/run-nightly-cluster-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}" \
Expand Down
2 changes: 1 addition & 1 deletion hack/yml_utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion test/common/vars-conf-cm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/tools/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit b961488

Please sign in to comment.