Skip to content

Commit 31c9d1b

Browse files
authored
ci: Update Kubernetes versions for e2e tests (#1111)
Added Nutanix 1.32 testing and Docker 1.33 testing, plus updating Nutanix machine images and Docker tested Kubernetes versions.
1 parent e175a9a commit 31c9d1b

File tree

4 files changed

+20
-12
lines changed

4 files changed

+20
-12
lines changed

.github/workflows/checks.yml

+11-8
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,13 @@ jobs:
6464
strategy:
6565
matrix:
6666
config:
67-
- {"provider": "Nutanix", "kubernetesMinor": "v1.30", "kubernetesVersion": "v1.30.5", "osImage": "nkp-rocky-9.5-release-1.30.5-20241204003513"}
68-
- {"provider": "Nutanix", "kubernetesMinor": "v1.31", "kubernetesVersion": "v1.31.4", "osImage": "nkp-rocky-9.5-release-1.31.4-20250205191544"}
69-
- {"provider": "Docker", "kubernetesMinor": "v1.30", "kubernetesVersion": "v1.30.11"}
70-
- {"provider": "Docker", "kubernetesMinor": "v1.31", "kubernetesVersion": "v1.31.7"}
71-
- {"provider": "Docker", "kubernetesMinor": "v1.32", "kubernetesVersion": "v1.32.3"}
67+
- {"provider": "Nutanix", "kubernetesMinor": "v1.30", "kubernetesVersion": "v1.30.10", "osImage": "nkp-rocky-9.5-release-1.30.10-20250417212833"}
68+
- {"provider": "Nutanix", "kubernetesMinor": "v1.31", "kubernetesVersion": "v1.31.4", "osImage": "nkp-rocky-9.5-release-1.31.4-20250409153435"}
69+
- {"provider": "Nutanix", "kubernetesMinor": "v1.32", "kubernetesVersion": "v1.32.3", "osImage": "nkp-rocky-9.5-release-1.32.3-20250404225535"}
70+
- {"provider": "Docker", "kubernetesMinor": "v1.30", "kubernetesVersion": "v1.30.12"}
71+
- {"provider": "Docker", "kubernetesMinor": "v1.31", "kubernetesVersion": "v1.31.8"}
72+
- {"provider": "Docker", "kubernetesMinor": "v1.32", "kubernetesVersion": "v1.32.4"}
73+
- {"provider": "Docker", "kubernetesMinor": "v1.33", "kubernetesVersion": "v1.33.0"}
7274
# Uncomment below once we have the ability to run e2e tests on other providers from GHA.
7375
# - {"provider": "AWS", "kubernetesMinor": "v1.29", "kubernetesVersion": "v1.29.6"}
7476
fail-fast: false
@@ -95,9 +97,10 @@ jobs:
9597
strategy:
9698
matrix:
9799
config:
98-
- {"provider": "Docker", "kubernetesMinor": "v1.30", "kubernetesVersion": "v1.30.11"}
99-
- {"provider": "Docker", "kubernetesMinor": "v1.31", "kubernetesVersion": "v1.31.7"}
100-
- {"provider": "Docker", "kubernetesMinor": "v1.32", "kubernetesVersion": "v1.32.3"}
100+
- {"provider": "Docker", "kubernetesMinor": "v1.30", "kubernetesVersion": "v1.30.12"}
101+
- {"provider": "Docker", "kubernetesMinor": "v1.31", "kubernetesVersion": "v1.31.8"}
102+
- {"provider": "Docker", "kubernetesMinor": "v1.32", "kubernetesVersion": "v1.32.4"}
103+
- {"provider": "Docker", "kubernetesMinor": "v1.33", "kubernetesVersion": "v1.33.0"}
101104
# Uncomment below once we have the ability to run e2e tests on other providers from GHA.
102105
# - {"provider": "Nutanix", "kubernetesMinor": "v1.29", "kubernetesVersion": "v1.29.6"}
103106
# - {"provider": "AWS", "kubernetesMinor": "v1.29", "kubernetesVersion": "v1.29.6"}

api/versions/coredns.go

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/versions/coredns_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ func TestReturnsCorrectMappingForGetKubernetesToCoreDNSVersionMap(t *testing.T)
4747
"v1.30": "v1.11.3",
4848
"v1.31": "v1.11.3",
4949
"v1.32": "v1.11.3",
50+
"v1.33": "v1.12.0",
5051
}
5152
assert.Equal(t, expected, mapping)
5253
}

make/kind.mk

+5-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ KIND_CLUSTER_NAME ?= $(GITHUB_REPOSITORY)-dev
77
KIND_KUBECONFIG ?= $(KIND_DIR)/$(KIND_CLUSTER_NAME)/kubeconfig
88

99
KINDEST_NODE_IMAGE ?= ghcr.io/mesosphere/kind-node
10-
KINDEST_NODE_VERSION_v1.30 ?= v1.30.10
11-
KINDEST_NODE_VERSION_v1.31 ?= v1.31.6
12-
KINDEST_NODE_VERSION_v1.32 ?= v1.32.2
10+
KINDEST_NODE_VERSION_v1.30 ?= v1.30.12
11+
KINDEST_NODE_VERSION_v1.31 ?= v1.31.8
12+
KINDEST_NODE_VERSION_v1.32 ?= v1.32.4
13+
KINDEST_NODE_VERSION_v1.33 ?= v1.33.0
1314
# Allow easy override of Kubernetes version to use via `make KIND_KUBERNETES_VERSION=v1.23` to use in CI
14-
KIND_KUBERNETES_VERSION ?= v1.32
15+
KIND_KUBERNETES_VERSION ?= v1.33
1516
ifndef KINDEST_NODE_VERSION_$(KIND_KUBERNETES_VERSION)
1617
$(error Unsupported Kind Kubernetes version: $(KIND_KUBERNETES_VERSION) (use on of: [$(patsubst KINDEST_NODE_VERSION_%,%,$(filter KINDEST_NODE_VERSION_%,$(.VARIABLES)))]))
1718
endif

0 commit comments

Comments
 (0)