Skip to content

Commit 93c22d7

Browse files
authored
Merge pull request #925 from hangscer8/update_k8s_version
update k8s to v1.26.7
2 parents e7a1597 + 234ba03 commit 93c22d7

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

hack/run-nightly-cluster-e2e.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,13 @@ sed -i "s/e2e-cluster1-install/${CLUSTER_OPERATION_NAME2}/" "${dest_config_path
147147
sed -i "s/cluster.yml/upgrade-cluster.yml/" "${dest_config_path}"/kubeanClusterOps.yml
148148
sed -i "s/v1.25.3/v1.26.0/" "${dest_config_path}"/vars-conf-cm.yml
149149

150-
## prepare cluster upgrade job yml --> upgrade from v1.25.3 to v1.26.5
150+
## prepare cluster upgrade job yml --> upgrade from v1.25.3 to v1.26.7
151151
dest_config_path="${REPO_ROOT}"/test/kubean_sonobouy_nightlye2e/e2e-upgrade-cluster-z/
152152
func_prepare_config_yaml "${SOURCE_CONFIG_PATH}" "${dest_config_path}"
153153
CLUSTER_OPERATION_NAME3="cluster1-upgrade-z"
154154
sed -i "s/e2e-cluster1-install/${CLUSTER_OPERATION_NAME3}/" "${dest_config_path}"/kubeanClusterOps.yml
155155
sed -i "s/cluster.yml/upgrade-cluster.yml/" "${dest_config_path}"/kubeanClusterOps.yml
156-
sed -i "s/v1.25.3/v1.26.5/" "${dest_config_path}"/vars-conf-cm.yml
156+
sed -i "s/v1.25.3/v1.26.7/" "${dest_config_path}"/vars-conf-cm.yml
157157

158158
ginkgo -v -race -timeout=6h --fail-fast ./test/kubean_sonobouy_nightlye2e/ -- --kubeconfig="${KUBECONFIG_FILE}" \
159159
--clusterOperationName="${CLUSTER_OPERATION_NAME1}" --vmipaddr="${vm_ip_addr1}" --vmipaddr2="${vm_ip_addr2}" \

test/offline-common/vars-conf-cm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ data:
2929
# github image repo define (ex multus only use that)
3030
github_image_repo: "{{registry_host}}/ghcr.io"
3131
# k8s-cluster
32-
kube_version: "v1.26.5"
32+
kube_version: "v1.26.7"
3333
container_manager: containerd
3434
k8s_image_pull_policy: IfNotPresent
3535
kube_network_plugin: calico

test/tools/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const (
3434
const (
3535
OriginK8Version = "v1.25.3"
3636
UpgradeK8Version_Y = "v1.26.0"
37-
UpgradeK8Version_Z = "v1.26.5"
37+
UpgradeK8Version_Z = "v1.26.7"
3838
NginxAlpha = "release-ci.daocloud.io/kubean/nginx:alpine"
3939
E2eInstallClusterYamlFolder = "e2e-install-cluster"
4040
)

version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
kubespray_version: 36e5d742dc2b3f7984398c38009f236be7c3c065
2-
kubernetes_version: v1.26.5
2+
kubernetes_version: v1.26.7

0 commit comments

Comments
 (0)