Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update e2e kube verison #1260

Merged
merged 2 commits into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/verify-kubespray.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
echo ${{ runner.os }}
echo ${{ runner.arch }}
echo ${{ github.workspace }}
export KUBE_VERSION=v1.28.8
export KUBE_VERSION=v1.28.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:
Expand Down
2 changes: 1 addition & 1 deletion examples/debug/airgap_demo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -638,4 +638,4 @@ apply_cluster_operation "upgrade" "v1.26.0" "${REGISTRY_ADDR}/${RLS_2_23_SPRAY_J

apply_cluster_operation "upgrade" "v1.27.5" "${REGISTRY_ADDR}/${RLS_2_23_SPRAY_JOB_IMG}"

apply_cluster_operation "upgrade" "v1.28.8" "${REGISTRY_ADDR}/${DEFAULT_SPRAY_JOB_IMG}"
apply_cluster_operation "upgrade" "v1.28.9" "${REGISTRY_ADDR}/${DEFAULT_SPRAY_JOB_IMG}"
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.28.8 to v1.29.0
## prepare cluster upgrade job yml --> upgrade from v1.28.9 to v1.29.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.28.8/v1.29.0/" "${dest_config_path}"/vars-conf-cm.yml
sed -i "s/v1.28.9/v1.29.0/" "${dest_config_path}"/vars-conf-cm.yml

## prepare cluster upgrade job yml --> upgrade from v1.28.8 to v1.28.9
## prepare cluster upgrade job yml --> upgrade from v1.29.0 to v1.29.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.28.8/v1.28.9/" "${dest_config_path}"/vars-conf-cm.yml
sed -i "s/v1.28.9/v1.29.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}" \
Expand Down
2 changes: 1 addition & 1 deletion hack/yml_utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.28.8"' $groupVarYml
yq -i '.kube_version = "v1.28.9"' $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.28.8"
kube_version: "v1.28.9"
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,9 +32,9 @@ const (
)

const (
OriginK8Version = "v1.28.8"
OriginK8Version = "v1.28.9"
UpgradeK8Version_Y = "v1.29.0"
UpgradeK8Version_Z = "v1.28.9"
UpgradeK8Version_Z = "v1.29.4"
NginxAlpha = "release-ci.daocloud.io/kubean/nginx:alpine"
E2eInstallClusterYamlFolder = "e2e-install-cluster"
)
Expand Down
Loading