From 10a7be477c2203aff7ff70e6b780ac4538ada77d Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Tue, 28 Apr 2026 12:26:40 +0300 Subject: [PATCH 1/3] chore(e2e): drop 1.31.0 e2e test matrix for v1.36.0 Signed-off-by: Hristo Hristov --- .github/workflows/e2e.yml | 2 +- Makefile | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 5cf9213fe..92d628068 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -64,10 +64,10 @@ jobs: fail-fast: false matrix: k8s-version: - - 'v1.31.0' - 'v1.32.0' - 'v1.33.0' - 'v1.34.0' + - 'v1.35.0' runs-on: labels: ubuntu-latest-8-cores steps: diff --git a/Makefile b/Makefile index 2b2f376b9..96254d264 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ CAPSULE_IMG ?= $(REGISTRY)/$(IMG_BASE) CLUSTER_NAME ?= capsule FILTER ?= --label-filter="!skip" ## Kubernetes Version Support -KUBERNETES_SUPPORTED_VERSION ?= "v1.35.0" +KUBERNETES_SUPPORTED_VERSION ?= "v1.36.0" ## Openshift Version Support OS_SUPPORTED_VERSION ?= "4.22.0-okd-scos.ec.10" @@ -95,6 +95,7 @@ helm-schema: helm-plugin-schema helm-test: HELM_KIND_CONFIG ?= "" helm-test: kind @mkdir -p /tmp/results || true + @$(KIND) build node-image $(KUBERNETES_SUPPORTED_VERSION) --image kindest/node:$(KUBERNETES_SUPPORTED_VERSION) @$(KIND) create cluster --wait=60s --name capsule-charts --image kindest/node:$(KUBERNETES_SUPPORTED_VERSION) --config ./hack/kind-cluster.yaml @make helm-test-exec @$(KIND) delete cluster --name capsule-charts @@ -108,6 +109,7 @@ helm-test-exec: ct helm-controller-version ko-build-all # Setup development env dev-build: kind + $(KIND) build node-image $(KUBERNETES_SUPPORTED_VERSION) --image kindest/node:$(KUBERNETES_SUPPORTED_VERSION) $(KIND) create cluster --wait=60s --name $(CLUSTER_NAME) --image kindest/node:$(KUBERNETES_SUPPORTED_VERSION) --config ./hack/kind-cluster.yaml $(MAKE) dev-install-deps @@ -441,6 +443,7 @@ trace-install: .PHONY: trace-e2e trace-e2e: kind $(MAKE) docker-build-capsule-trace + $(KIND) build node-image $(KUBERNETES_SUPPORTED_VERSION) --image kindest/node:$(KUBERNETES_SUPPORTED_VERSION) $(KIND) create cluster --wait=60s --image kindest/node:$(KUBERNETES_SUPPORTED_VERSION) --config hack/kind-cluster.yml $(MAKE) e2e-load-image CLUSTER_NAME=capsule-tracing IMAGE=$(CAPSULE_IMG) VERSION=tracing $(MAKE) trace-install From e60cecf13921457c13adb4997d9a9060402939ef Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Wed, 29 Apr 2026 22:40:21 +0300 Subject: [PATCH 2/3] chore(e2e): drop 1.31.0 e2e test matrix for v1.35.0 Signed-off-by: Hristo Hristov --- .github/workflows/e2e.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 92d628068..01eda9252 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -91,7 +91,6 @@ jobs: fail-fast: false matrix: os-version: # https://quay.io/repository/minc-org/minc?tab=tags&tag=latest - - '4.18.0-okd-scos.9' - '4.19.0-okd-scos.17' runs-on: ubuntu-latest-8-cores steps: From 28525566d8ee972eedef0bd5391128e0fafbd126 Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Wed, 6 May 2026 19:43:33 +0300 Subject: [PATCH 3/3] chore(e2e): drop 1.31.0 e2e test matrix for v1.35.0 Signed-off-by: Hristo Hristov --- .goreleaser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index a2635d744..bf26694cd 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -75,7 +75,7 @@ release: > > | Kubernetes version | Minimum required | > |--------------------|------------------| - > | `v1.35` | `>= 1.35.0` | + > | `v1.36` | `>= 1.36.0` | Thanks to all the contributors! 🚀 🦄