Skip to content

Commit 2d0f3a2

Browse files
authored
Merge pull request #3088 from jackfrancis/default-k8s-version-rev-1.25
Update default k8s version to v1.25 for testing
2 parents 83cf7f6 + b566d64 commit 2d0f3a2

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ GINKGO_VER := v2.7.0
109109
GINKGO_BIN := ginkgo
110110
GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)
111111

112-
KUBECTL_VER := v1.22.4
112+
KUBECTL_VER := v1.25.6
113113
KUBECTL_BIN := kubectl
114114
KUBECTL := $(TOOLS_BIN_DIR)/$(KUBECTL_BIN)-$(KUBECTL_VER)
115115

test/e2e/config/azure-dev.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,13 @@ providers:
153153
variables:
154154
AKS_KUBERNETES_VERSION: "latest"
155155
AKS_KUBERNETES_VERSION_UPGRADE_FROM: "latest-1"
156-
KUBERNETES_VERSION: "${KUBERNETES_VERSION:-stable-1.24}"
157-
FLATCAR_KUBERNETES_VERSION: "${FLATCAR_KUBERNETES_VERSION:-stable-1.24}"
156+
KUBERNETES_VERSION: "${KUBERNETES_VERSION:-stable-1.25}"
157+
FLATCAR_KUBERNETES_VERSION: "${FLATCAR_KUBERNETES_VERSION:-stable-1.25}"
158158
FLATCAR_VERSION: "${FLATCAR_VERSION:-latest}"
159159
ETCD_VERSION_UPGRADE_TO: "3.5.4-0"
160160
COREDNS_VERSION_UPGRADE_TO: "v1.9.3"
161-
KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-stable-1.25}"
162-
KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-stable-1.24}"
161+
KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-stable-1.26}"
162+
KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-stable-1.25}"
163163
CNI: "${PWD}/templates/addons/calico.yaml"
164164
ADDONS_PATH: "${PWD}/templates/addons"
165165
REDACT_LOG_SCRIPT: "${PWD}/hack/log/redact.sh"

0 commit comments

Comments
 (0)