From 63bcf1d2be38e383491f9ca00e88264b0af886b6 Mon Sep 17 00:00:00 2001 From: Vasi Vasireddy <41936996+vasireddy99@users.noreply.github.com> Date: Wed, 22 May 2024 00:58:26 -0700 Subject: [PATCH] Support for kubernetes 1.30 version (#2975) * Support for kubernetes 1.30 version * Update makefile --- .chloggen/kind130.yaml | 16 ++++++++++++++++ .github/workflows/e2e.yaml | 2 +- .github/workflows/scorecard.yaml | 2 +- Makefile | 2 +- kind-1.30.yaml | 18 ++++++++++++++++++ 5 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 .chloggen/kind130.yaml create mode 100644 kind-1.30.yaml diff --git a/.chloggen/kind130.yaml b/.chloggen/kind130.yaml new file mode 100644 index 0000000000..8ded213051 --- /dev/null +++ b/.chloggen/kind130.yaml @@ -0,0 +1,16 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: 'enhancement' + +# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action) +component: operator + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Support for Kubernetes 1.30 version. + +# One or more tracking issues related to the change +issues: [2881] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: \ No newline at end of file diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index c87c7824b0..358f367439 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -21,7 +21,7 @@ jobs: # should be compatible with them. kube-version: - "1.23" - - "1.29" + - "1.30" group: - e2e - e2e-automatic-rbac diff --git a/.github/workflows/scorecard.yaml b/.github/workflows/scorecard.yaml index ed3cbc493b..c0eb437a9e 100644 --- a/.github/workflows/scorecard.yaml +++ b/.github/workflows/scorecard.yaml @@ -18,7 +18,7 @@ jobs: matrix: kube-version: - "1.23" - - "1.29" + - "1.30" steps: diff --git a/Makefile b/Makefile index c5a601fe0a..157d172907 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ endif START_KIND_CLUSTER ?= true -KUBE_VERSION ?= 1.29 +KUBE_VERSION ?= 1.30 KIND_CONFIG ?= kind-$(KUBE_VERSION).yaml KIND_CLUSTER_NAME ?= "otel-operator" diff --git a/kind-1.30.yaml b/kind-1.30.yaml new file mode 100644 index 0000000000..ad68ebecd3 --- /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.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e + kubeadmConfigPatches: + - | + kind: InitConfiguration + nodeRegistration: + kubeletExtraArgs: + node-labels: "ingress-ready=true" + extraPortMappings: + - containerPort: 80 + hostPort: 80 + protocol: TCP + - containerPort: 443 + hostPort: 443 + protocol: TCP