Skip to content

Commit 550b29d

Browse files
authored
Merge pull request #1579 from FloatXD/e2e-up-20
[Test] Fix the problem of low k8s version and Cilium permission in the e2e test
2 parents abd006e + d2ba188 commit 550b29d

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

hack/run-nightly-cluster-e2e.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,12 @@ func_prepare_config_yaml "${SOURCE_CONFIG_PATH}" "${dest_config_path}"
146146
CLUSTER_OPERATION_NAME1="cluster1-install-"`date "+%H-%M-%S"`
147147

148148
# set vars-conf-cm.yml
149-
sed -i "s/1.31.6/1.30.7/" "${dest_config_path}"/vars-conf-cm.yml
149+
sed -i "s/1.31.6/1.31.0/" "${dest_config_path}"/vars-conf-cm.yml
150150

151151
sed -i "s/e2e-cluster1-install/${CLUSTER_OPERATION_NAME1}/" "${dest_config_path}"/kubeanClusterOps.yml
152152

153153

154-
## prepare cluster upgrade job yml --> upgrade from v1.30.7 to v1.31.2
154+
## prepare cluster upgrade job yml --> upgrade from v1.31.0 to v1.31.2
155155
dest_config_path="${REPO_ROOT}"/test/kubean_sonobouy_nightlye2e/e2e-upgrade-cluster-y/
156156
func_prepare_config_yaml "${SOURCE_CONFIG_PATH}" "${dest_config_path}"
157157
CLUSTER_OPERATION_NAME2="cluster1-upgrade-y"

test/common/vars-conf-cm.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
data:
77
group_vars.yml: |
88
# k8s-cluster
9+
kube_owner: root
910
unsafe_show_logs: true
1011
kube_version: "1.31.6"
1112
container_manager: containerd

test/tools/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const (
3232
)
3333

3434
const (
35-
OriginK8Version = "v1.30.7"
35+
OriginK8Version = "v1.31.0"
3636
UpgradeK8Version_Y = "v1.31.2"
3737
UpgradeK8Version_Z = "v1.31.6"
3838
NginxAlpha = "release-ci.daocloud.io/kubean/nginx:alpine"

0 commit comments

Comments
 (0)