From 1dd161eb9f54f8cc82f55aa548c16891c2efc2f5 Mon Sep 17 00:00:00 2001
From: Vasi Vasireddy <41936996+vasireddy99@users.noreply.github.com>
Date: Fri, 30 Aug 2024 05:56:16 -0700
Subject: [PATCH] Support for kubernetes 1.31 version (#3246)

---
 .chloggen/operator31.yaml        | 16 ++++++++++++++++
 .github/workflows/e2e.yaml       |  2 +-
 .github/workflows/scorecard.yaml |  2 +-
 Makefile                         |  2 +-
 kind-1.31.yaml                   | 20 ++++++++++++++++++++
 5 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 .chloggen/operator31.yaml
 create mode 100644 kind-1.31.yaml

diff --git a/.chloggen/operator31.yaml b/.chloggen/operator31.yaml
new file mode 100644
index 0000000000..0e52ea95cb
--- /dev/null
+++ b/.chloggen/operator31.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.31` version.
+
+# One or more tracking issues related to the change
+issues: [3247]
+
+# (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:
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 1288d5c054..677b7b0806 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.30"
+         - "1.31"
        group:
          - e2e
          - e2e-automatic-rbac
diff --git a/.github/workflows/scorecard.yaml b/.github/workflows/scorecard.yaml
index 176392b5df..c031fe333f 100644
--- a/.github/workflows/scorecard.yaml
+++ b/.github/workflows/scorecard.yaml
@@ -18,7 +18,7 @@ jobs:
       matrix:
         kube-version:
           - "1.23"
-          - "1.30"
+          - "1.31"
 
     steps:
 
diff --git a/Makefile b/Makefile
index cd614f1f20..3a8396009a 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ endif
 
 START_KIND_CLUSTER ?= true
 
-KUBE_VERSION ?= 1.30
+KUBE_VERSION ?= 1.31
 KIND_CONFIG ?= kind-$(KUBE_VERSION).yaml
 KIND_CLUSTER_NAME ?= "otel-operator"
 
diff --git a/kind-1.31.yaml b/kind-1.31.yaml
new file mode 100644
index 0000000000..cecb00146f
--- /dev/null
+++ b/kind-1.31.yaml
@@ -0,0 +1,20 @@
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+networking:
+  ipFamily: dual
+nodes:
+  - role: control-plane
+    image: kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865
+    kubeadmConfigPatches:
+      - |
+        kind: InitConfiguration
+        nodeRegistration:
+          kubeletExtraArgs:
+            node-labels: "ingress-ready=true"
+    extraPortMappings:
+      - containerPort: 80
+        hostPort: 80
+        protocol: TCP
+      - containerPort: 443
+        hostPort: 443
+        protocol: TCP