Add support for Kubernetes 1.35 (#4582)

* Add support for Kubernetes 1.35

* Fix e2e-crd-validations test for K8s 1.35

K8s 1.35 changed CEL validation error messages to no longer include
"object": in the error output. Update the test to handle both formats.

Author: Kausik-A

.chloggen/eks135.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. collector, target allocator, auto-instrumentation, opamp, github action)
+component: operator
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add support for Kubernetes 1.35
+
+# One or more tracking issues related to the change
+issues: [4575]
+
+# (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:

.github/workflows/e2e-reusable.yaml

@@ -63,7 +63,7 @@ jobs:
         # should be compatible with them.
         kube-version:
         - "1.25"
-        - "1.34"
+        - "1.35"
         group:
         - e2e
         - e2e-automatic-rbac

.github/workflows/scorecard.yaml

@@ -21,7 +21,7 @@ jobs:
       matrix:
         kube-version:
           - "1.25"
-          - "1.34"
+          - "1.35"
 
     steps:
 

Makefile

@@ -96,7 +96,7 @@ endif
 
 START_KIND_CLUSTER ?= true
 
-KUBE_VERSION ?= 1.34
+KUBE_VERSION ?= 1.35
 KIND_CONFIG ?= kind-$(KUBE_VERSION).yaml
 KIND_CLUSTER_NAME ?= "otel-operator"
 CHAINSAW_SELECTOR := $(shell [ "$(shell printf '%s\n' "$(KUBE_VERSION)" "1.29" | sort -V | head -n1)" = "1.29" ] && echo "--selector sidecar=native" || echo "--selector sidecar=legacy")

kind-1.35.yaml

@@ -0,0 +1,20 @@
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+networking:
+  ipFamily: dual
+nodes:
+  - role: control-plane
+    image: kindest/node:v1.35.0@sha256:452d707d4862f52530247495d180205e029056831160e22870e37e3f6c1ac31f
+    kubeadmConfigPatches:
+      - |
+        kind: InitConfiguration
+        nodeRegistration:
+          kubeletExtraArgs:
+            node-labels: "ingress-ready=true"
+    extraPortMappings:
+      - containerPort: 80
+        hostPort: 80
+        protocol: TCP
+      - containerPort: 443
+        hostPort: 443
+        protocol: TCP

tests/e2e-crd-validations/sidecar/chainsaw-test.yaml

@@ -15,6 +15,9 @@ spec:
     - name: priorityClassErrorMessageCEL
       value: |-
         OpenTelemetryCollector.opentelemetry.io "sidecar-priorityclass" is invalid: spec: Invalid value: "object": the OpenTelemetry Collector mode is set to sidecar, which does not support the attribute 'priorityClassName'
+    - name: priorityClassErrorMessageCELv135
+      value: |-
+        OpenTelemetryCollector.opentelemetry.io "sidecar-priorityclass" is invalid: spec: Invalid value: the OpenTelemetry Collector mode is set to sidecar, which does not support the attribute 'priorityClassName'
     - name: priorityClassErrorMessageWebhook
       value: |-
         admission webhook "vopentelemetrycollectorcreateupdatebeta.kb.io" denied the request: the OpenTelemetry Collector mode is set to sidecar, which does not support the attribute 'priorityClassName'
@@ -24,12 +27,15 @@ spec:
         expect:
          - check:
             ($error != null): true
-            ($error): (($minorVersion > `24` && $priorityClassErrorMessageCEL) || $priorityClassErrorMessageWebhook)
+            ($error): (($minorVersion >= `35` && $priorityClassErrorMessageCELv135) || ($minorVersion > `24` && $minorVersion < `35` && $priorityClassErrorMessageCEL) || $priorityClassErrorMessageWebhook)
   - name: step-01
     bindings:
     - name: tolerationErrorMessageCEL
       value: |-
         OpenTelemetryCollector.opentelemetry.io "sidecar-tolerations" is invalid: spec: Invalid value: "object": the OpenTelemetry Collector mode is set to sidecar, which does not support the attribute 'tolerations'
+    - name: tolerationErrorMessageCELv135
+      value: |-
+        OpenTelemetryCollector.opentelemetry.io "sidecar-tolerations" is invalid: spec: Invalid value: the OpenTelemetry Collector mode is set to sidecar, which does not support the attribute 'tolerations'
     - name: tolerationErrorMessageWebhook
       value: |-
         admission webhook "vopentelemetrycollectorcreateupdatebeta.kb.io" denied the request: the OpenTelemetry Collector mode is set to sidecar, which does not support the attribute 'tolerations'
@@ -39,12 +45,15 @@ spec:
         expect:
          - check:
             ($error != null): true
-            ($error): (($minorVersion > `24` && $tolerationErrorMessageCEL) || $tolerationErrorMessageWebhook)
+            ($error): (($minorVersion >= `35` && $tolerationErrorMessageCELv135) || ($minorVersion > `24` && $minorVersion < `35` && $tolerationErrorMessageCEL) || $tolerationErrorMessageWebhook)
   - name: step-02
     bindings:
     - name: affinityErrorMessageCEL
       value: |-
         OpenTelemetryCollector.opentelemetry.io "sidecar-affinity" is invalid: spec: Invalid value: "object": the OpenTelemetry Collector mode is set to sidecar, which does not support the attribute 'affinity'
+    - name: affinityErrorMessageCELv135
+      value: |-
+        OpenTelemetryCollector.opentelemetry.io "sidecar-affinity" is invalid: spec: Invalid value: the OpenTelemetry Collector mode is set to sidecar, which does not support the attribute 'affinity'
     - name: affinityErrorMessageWebhook
       value: |-
         admission webhook "vopentelemetrycollectorcreateupdatebeta.kb.io" denied the request: the OpenTelemetry Collector mode is set to sidecar, which does not support the attribute 'affinity'
@@ -54,13 +63,16 @@ spec:
         expect:
          - check:
             ($error != null): true
-            ($error): (($minorVersion > `24` && $affinityErrorMessageCEL) || $affinityErrorMessageWebhook)
+            ($error): (($minorVersion >= `35` && $affinityErrorMessageCELv135) || ($minorVersion > `24` && $minorVersion < `35` && $affinityErrorMessageCEL) || $affinityErrorMessageWebhook)
   - name: step-03
     bindings:
-    - name: affinityErrorMessageCEL
+    - name: additionalContainersErrorMessageCEL
       value: |-
         OpenTelemetryCollector.opentelemetry.io "sidecar-additional-containers" is invalid: spec: Invalid value: "object": the OpenTelemetry Collector mode is set to sidecar, which does not support the attribute 'additionalContainers'
-    - name: affinityErrorMessageWebhook
+    - name: additionalContainersErrorMessageCELv135
+      value: |-
+        OpenTelemetryCollector.opentelemetry.io "sidecar-additional-containers" is invalid: spec: Invalid value: the OpenTelemetry Collector mode is set to sidecar, which does not support the attribute 'additionalContainers'
+    - name: additionalContainersErrorMessageWebhook
       value: |-
         admission webhook "vopentelemetrycollectorcreateupdatebeta.kb.io" denied the request: the OpenTelemetry Collector mode is set to sidecar, which does not support the attribute 'AdditionalContainers'
     try:
@@ -69,4 +81,4 @@ spec:
         expect:
          - check:
             ($error != null): true
-            ($error): (($minorVersion > `24` && $affinityErrorMessageCEL) || $affinityErrorMessageWebhook)
+            ($error): (($minorVersion >= `35` && $additionalContainersErrorMessageCELv135) || ($minorVersion > `24` && $minorVersion < `35` && $additionalContainersErrorMessageCEL) || $additionalContainersErrorMessageWebhook)