This is an automated email from the ASF dual-hosted git repository.
wilfred-s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yunikorn-k8shim.git
The following commit(s) were added to refs/heads/master by this push:
new c8b9366d [YUNIKORN-3290] Add K8s 1.36 to the e2e tests in CI (#1033)
c8b9366d is described below
commit c8b9366d1c9cde4cba179463cf0e99fc34e4d1b2
Author: Manikandan R <[email protected]>
AuthorDate: Thu Jun 4 18:56:49 2026 +1000
[YUNIKORN-3290] Add K8s 1.36 to the e2e tests in CI (#1033)
Updated k8s matrix for weekly e2e tests
Add kind 1.36 yaml for k8s 1.36.1
Upgrade kind to v0.32
Closes: #1033
Signed-off-by: Wilfred Spiegelenburg <[email protected]>
---
.github/workflows/pre-commit.yml | 2 +-
.github/workflows/weekly-e2e.yml | 7 +++++--
Makefile | 2 +-
scripts/kind-1.36.yaml | 24 ++++++++++++++++++++++++
scripts/run-e2e-tests.sh | 5 ++++-
5 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index bc5e3e0a..da6352b8 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -50,10 +50,10 @@ jobs:
matrix:
k8s:
[
+ v1.36.1,
v1.35.1,
v1.34.3,
v1.33.7,
- v1.32.11,
v1.24.17,
]
steps:
diff --git a/.github/workflows/weekly-e2e.yml b/.github/workflows/weekly-e2e.yml
index 8273e297..8b73fda9 100644
--- a/.github/workflows/weekly-e2e.yml
+++ b/.github/workflows/weekly-e2e.yml
@@ -13,8 +13,11 @@ jobs:
matrix:
k8s:
[
- v1.33.1,
- v1.32.2,
+ v1.36.1,
+ v1.35.1,
+ v1.34.3,
+ v1.33.7,
+ v1.32.11,
v1.31.6,
v1.30.10,
v1.29.14,
diff --git a/Makefile b/Makefile
index ec8948dd..22c4abff 100644
--- a/Makefile
+++ b/Makefile
@@ -171,7 +171,7 @@ KUBECTL_BIN=$(KUBECTL_PATH)/kubectl
export PATH := $(BASE_DIR)/$(KUBECTL_PATH):$(PATH)
# kind
-KIND_VERSION=v0.31.0
+KIND_VERSION=v0.32.0
KIND_PATH=$(TOOLS_DIR)/kind-$(KIND_VERSION)
KIND_BIN=$(KIND_PATH)/kind
export PATH := $(BASE_DIR)/$(KIND_PATH):$(PATH)
diff --git a/scripts/kind-1.36.yaml b/scripts/kind-1.36.yaml
new file mode 100644
index 00000000..909b4bd2
--- /dev/null
+++ b/scripts/kind-1.36.yaml
@@ -0,0 +1,24 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+featureGates:
+nodes:
+ - role: control-plane
+ - role: worker
+ - role: worker
diff --git a/scripts/run-e2e-tests.sh b/scripts/run-e2e-tests.sh
index 5f5f66d2..5b903aea 100755
--- a/scripts/run-e2e-tests.sh
+++ b/scripts/run-e2e-tests.sh
@@ -50,9 +50,12 @@ function update_kind_config() {
if verlt "${version}" "1.32"; then
# 1.31 or earlier
KIND_CONFIG=./scripts/kind.yaml
- else
+ elif verlt "${version}" "1.36"; then
# 1.32 or later; enable InPlacePodVerticalScaling and PodLevelResources
feature flags
KIND_CONFIG=./scripts/kind-1.32.yaml
+ else
+ # 1.36 or later; remove features that moved to beta or are completely gone.
+ KIND_CONFIG=./scripts/kind-1.36.yaml
fi
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
