From b73c8d34b48df65f5ae6b395177db6c3fd38a571 Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Fri, 9 Aug 2024 11:10:11 +0200 Subject: [PATCH] Test on k8s 1.30 (#2647) Signed-off-by: Pavol Loffay --- .github/workflows/e2e.yaml | 2 +- Makefile | 4 ++-- kind-1.30.yaml | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 kind-1.30.yaml diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 892bbfddd..a55b4cfac 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -25,7 +25,7 @@ jobs: matrix: kube-version: - "1.19" - - "1.28" + - "1.30" testsuite: - { name: "elasticsearch", label: "Elasticsearch" } - { name: "examples", label: "Examples" } diff --git a/Makefile b/Makefile index 8239be7ce..a80f48e1a 100644 --- a/Makefile +++ b/Makefile @@ -85,9 +85,9 @@ LD_FLAGS ?= "-X $(VERSION_PKG).version=$(VERSION) -X $(VERSION_PKG).buildDate=$( # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST ?= $(LOCALBIN)/setup-envtest -ENVTEST_K8S_VERSION = 1.27 +ENVTEST_K8S_VERSION = 1.30 # Options for KIND version to use -export KUBE_VERSION ?= 1.27 +export KUBE_VERSION ?= 1.30 KIND_CONFIG ?= kind-$(KUBE_VERSION).yaml SCORECARD_TEST_IMG ?= quay.io/operator-framework/scorecard-test:v$(OPERATOR_SDK_VERSION) diff --git a/kind-1.30.yaml b/kind-1.30.yaml new file mode 100644 index 000000000..9f9460b11 --- /dev/null +++ b/kind-1.30.yaml @@ -0,0 +1,18 @@ +kind: Cluster +apiVersion: kind.x-k8s.io/v1alpha4 +nodes: +- role: control-plane + image: kindest/node:v1.30.2@sha256:ecfe5841b9bee4fe9690f49c118c33629fa345e3350a0c67a5a34482a99d6bba + kubeadmConfigPatches: + - | + kind: InitConfiguration + nodeRegistration: + kubeletExtraArgs: + node-labels: "ingress-ready=true" + extraPortMappings: + - containerPort: 80 + hostPort: 80 + protocol: TCP + - containerPort: 443 + hostPort: 443 + protocol: TCP