[chore]: update all CI to helm 4+

.github/workflows/collector-test.yaml

@@ -22,7 +22,7 @@ jobs:
         uses: ./.github/actions/setup
         with:
           create-kind-cluster: "true"
-          helm-version: "v4.0.3"
+          helm-version: "v4.0.5"
 
       - name: Run chart-testing (install)
         run: ct install --charts charts/opentelemetry-collector

.github/workflows/demo-test.yaml

@@ -16,8 +16,7 @@ jobs:
     strategy:
       matrix:
         helm-version:
-          - "v3.14.4"
-          - "v4.0.3"
+          - "v4.0.5"
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/ebpf-test.yaml

@@ -16,8 +16,7 @@ jobs:
     strategy:
       matrix:
         helm-version:
-          - "v3.9.4"
-          - "v4.0.3"
+          - "v4.0.5"
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/kube-stack-test.yaml

@@ -16,8 +16,7 @@ jobs:
     strategy:
       matrix:
         helm-version:
-          - "v3.11.3"
-          - "v4.0.3"
+          - "v4.0.5"
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/lint.yaml

@@ -14,8 +14,7 @@ jobs:
     strategy:
       matrix:
         helm-version:
-          - "v3.14.4"
-          - "v4.0.3"
+          - "v4.0.5"
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/operator-test.yaml

@@ -16,8 +16,7 @@ jobs:
     strategy:
       matrix:
         helm-version:
-          - "v3.9.4"
-          - "v4.0.3"
+          - "v4.0.5"
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -102,8 +101,7 @@ jobs:
     strategy:
       matrix:
         helm-version:
-          - "v3.9.4"
-          - "v4.0.3"
+          - "v4.0.5"
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/release.yaml

@@ -29,7 +29,7 @@ jobs:
       - name: Install Helm
         uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0
         with:
-          version: v3.9.0
+          version: v4.0.5
 
       - name: Add dependent repositories
         run: |

.github/workflows/ta-test.yaml

@@ -16,8 +16,7 @@ jobs:
     strategy:
       matrix:
         helm-version:
-          - "v3.9.4"
-          - "v4.0.3"
+          - "v4.0.5"
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/update-chart-app-version.yaml

@@ -74,7 +74,7 @@ jobs:
         uses: ./.github/actions/setup
         with:
           create-kind-cluster: "false"
-          helm-version: "v3.14.4"
+          helm-version: "v4.0.5"
 
       - name: Update chart
         id: update

CONTRIBUTING.md

@@ -12,7 +12,7 @@ We'd love your help!
 
 To work with this repository, ensure you have:
 
-- Helm 3.8+
+- Helm 4.0+
 
 - chart-testing (ct) 3.7+
 

Makefile

@@ -26,6 +26,7 @@ generate-examples:
 				fi; \
 				rm -rf $${EXAMPLES_DIR}/$${example}/rendered/$${chart_name}; \
 			done; \
+			find "$${EXAMPLES_DIR}/$${example}/rendered" -type f -exec perl -i -0777 -pe 's/[ \t\n]+(?=\n---\n)//g; s/[ \t\n]+\z/\n/' {} +; \
 		done; \
 	done
 
@@ -47,6 +48,7 @@ check-examples:
 					mv ${TMP_DIRECTORY}/$${example}/$${chart_name}/charts/$${subchart}/templates/* "${TMP_DIRECTORY}/$${example}/$${chart_name}/templates/$${subchart}"; \
 				done; \
 			done; \
+			find "${TMP_DIRECTORY}/$${example}/$${chart_name}/templates" -type f -exec perl -i -0777 -pe 's/[ \t\n]+(?=\n---\n)//g; s/[ \t\n]+\z/\n/' {} +; \
 			if diff -r -I 'checksum/config' -I 'helm\.sh/chart' "$${EXAMPLES_DIR}/$${example}/rendered" "${TMP_DIRECTORY}/$${example}/$${chart_name}/templates" > /dev/null; then \
 				echo "Passed $${example}"; \
 			else \

charts/opentelemetry-collector/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-collector
-version: 0.157.1
+version: 0.157.2
 description: OpenTelemetry Collector Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/

charts/opentelemetry-collector/README.md

@@ -6,7 +6,7 @@ in kubernetes cluster.
 ## Prerequisites
 
 - Kubernetes 1.24+
-- Helm 3.9+
+- Helm 4.0+
 
 ## Installing the Chart
 

charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml

@@ -5,7 +5,7 @@ kind: ClusterRole
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"

charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml

@@ -5,7 +5,7 @@ kind: ClusterRoleBinding
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"

charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"

charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"
@@ -26,7 +26,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: ea11931fd388ea948ccfc6c90552c5cb1901b048a8b6eac552a15dfaa78f98cb
+        checksum/config: 7f9f403e6300750178b10254c3f82bef49d0dd5303ad6767592b20fac9b76d22
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"

charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"

charts/opentelemetry-collector/examples/custom-metrics-hpa/rendered/configmap.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"

charts/opentelemetry-collector/examples/custom-metrics-hpa/rendered/deployment.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"
@@ -25,7 +25,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: a7e6a4cd68d3a479a4f25e8a86dafca7623b6f51b227b9a2ade99ba1ad8677c2
+        checksum/config: 06d2923956fe527e471a771d078f7faa122e4db60c8337fe8272f57f6db6de2f
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/custom-metrics-hpa/rendered/hpa.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"

charts/opentelemetry-collector/examples/custom-metrics-hpa/rendered/service.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"

charts/opentelemetry-collector/examples/custom-metrics-hpa/rendered/serviceaccount.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"
@@ -25,7 +25,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: ce4f5e1770239e7e0bb4b70b6b9a4838f6aabd5ec3e3f1fa2ff2f36148e5e4bf
+        checksum/config: b9879afeef8482d1f89e8fbc2b10c10cd56c260f894eacc25c7659637de88a32
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"
@@ -26,7 +26,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: a7e6a4cd68d3a479a4f25e8a86dafca7623b6f51b227b9a2ade99ba1ad8677c2
+        checksum/config: 06d2923956fe527e471a771d078f7faa122e4db60c8337fe8272f57f6db6de2f
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"

charts/opentelemetry-collector/examples/daemonset-annotation-discovery/rendered/clusterrole.yaml

@@ -5,7 +5,7 @@ kind: ClusterRole
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"

charts/opentelemetry-collector/examples/daemonset-annotation-discovery/rendered/clusterrolebinding.yaml

@@ -5,7 +5,7 @@ kind: ClusterRoleBinding
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"

charts/opentelemetry-collector/examples/daemonset-annotation-discovery/rendered/configmap-agent.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"

charts/opentelemetry-collector/examples/daemonset-annotation-discovery/rendered/daemonset.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"
@@ -25,7 +25,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 70bbfcbcf363d551644fda302990d6c62ad4cf8e5586152d71608fcbf437033b
+        checksum/config: 1f749caf8a2dd6c4e035ba17fc10820a67a055d9ee39176e863d968c25183cf5
         io.opentelemetry.discovery.logs/enabled: "false"
       labels:
         app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-annotation-discovery/rendered/serviceaccount.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"

charts/opentelemetry-collector/examples/daemonset-cluster-metrics/rendered/clusterrole.yaml

@@ -5,7 +5,7 @@ kind: ClusterRole
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"

charts/opentelemetry-collector/examples/daemonset-cluster-metrics/rendered/clusterrolebinding.yaml

@@ -5,7 +5,7 @@ kind: ClusterRoleBinding
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.157.1
+    helm.sh/chart: opentelemetry-collector-0.157.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.152.0"