Merge branch 'main' into issue-1741

open-telemetry · Jan 24, 2025 · 6a8a660 · 6a8a660
2 parents 0cd2c7b + b2ff25e
commit 6a8a660
Show file tree

Hide file tree

Showing 66 changed files with 167 additions and 154 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -37,7 +37,7 @@ jobs:
           helm repo add opensearch https://opensearch-project.github.io/helm-charts
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.6.0
+        uses: helm/chart-releaser-action@v1.7.0
         with:
           charts_dir: charts
         env:

diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-collector
-version: 0.111.2
+version: 0.115.0
 description: OpenTelemetry Collector Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/
@@ -12,4 +12,4 @@ maintainers:
   - name: jaronoff97
   - name: TylerHelmuth
 icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
-appVersion: 0.115.1
+appVersion: 0.118.0
diff --git a/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml b/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml
@@ -5,10 +5,10 @@ kind: ClusterRole
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: standalone-collector
 rules:

diff --git a/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml b/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml
@@ -5,10 +5,10 @@ kind: ClusterRoleBinding
 metadata:
   name: example-opentelemetry-collector
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: standalone-collector
 roleRef:

diff --git a/charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml
@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: standalone-collector
 data:

diff --git a/charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml
@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: standalone-collector
 spec:
@@ -25,7 +25,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 733b50803043968ec8189c1a88fd0c36d0575a0be962938fb3c702992edeb4d8
+        checksum/config: 3dc9e6eeb990a2574b2fa16a64baae703c7692b1d7fabdaecee7245874861ec2
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector
@@ -45,7 +45,7 @@ spec:
             - --config=/conf/relay.yaml
           securityContext:
             {}
-          image: "otel/opentelemetry-collector-k8s:0.115.1"
+          image: "otel/opentelemetry-collector-k8s:0.118.0"
           imagePullPolicy: IfNotPresent
           ports:
 

diff --git a/charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml b/charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml
@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: standalone-collector
     component: standalone-collector

diff --git a/charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml
@@ -6,9 +6,9 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: standalone-collector
diff --git a/...s/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml b/...s/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml
@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: agent-collector
 data:

diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml
@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: standalone-collector
 data:

diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml
@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: agent-collector
 spec:
@@ -23,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 01a783ab749adf07de571a0f5917e00736219517369475d89a0028af8ea1afb3
+        checksum/config: 8adf6b42453cb5e36a96c2751970d14ba8a5f41e89b03499a7b668104abf19df
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector
@@ -43,7 +43,7 @@ spec:
             - --config=/conf/relay.yaml
           securityContext:
             {}
-          image: "otel/opentelemetry-collector-k8s:0.115.1"
+          image: "otel/opentelemetry-collector-k8s:0.118.0"
           imagePullPolicy: IfNotPresent
           ports:
 

diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml
@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: standalone-collector
 spec:
@@ -25,7 +25,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 5738456934d30986cfa406c7e5fc77d31b3a6e32c00a8d2cb776de2ad02ec463
+        checksum/config: 06426862204315218953a2b24b1f1194e3f964f6fdcd5535932ca395489ecbfc
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector
@@ -45,7 +45,7 @@ spec:
             - --config=/conf/relay.yaml
           securityContext:
             {}
-          image: "otel/opentelemetry-collector-k8s:0.115.1"
+          image: "otel/opentelemetry-collector-k8s:0.118.0"
           imagePullPolicy: IfNotPresent
           ports:
 

diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml
@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: standalone-collector
     component: standalone-collector

diff --git a/...ts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml b/...ts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml
@@ -6,9 +6,9 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: standalone-collector
diff --git a/...s/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml b/...s/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml
@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: agent-collector
 data:

diff --git a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml
@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: agent-collector
 spec:
@@ -23,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: d92a50391caec1f2a07fb58dc7ca615f17eee5e8cd71832dbfe0418aa05aab3f
+        checksum/config: fb9dba5ca570816b7bbd06f550e8a5ce1dc457972bd52de104e7c2d50c94950a
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector
@@ -43,7 +43,7 @@ spec:
             - --config=/conf/relay.yaml
           securityContext:
             {}
-          image: "otel/opentelemetry-collector-k8s:0.115.1"
+          image: "otel/opentelemetry-collector-k8s:0.118.0"
           imagePullPolicy: IfNotPresent
           ports:
 

diff --git a/...ts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml b/...ts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml
@@ -6,9 +6,9 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: agent-collector
diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml
@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: agent-collector
 data:

diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml
@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: agent-collector
 spec:
@@ -23,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: f8bd0a6dc24b1ef3ec12984f87ed027f1a7ba9834baa5a774785f659b567195c
+        checksum/config: abac5308d1e771f809260cb4077a0ac094dc413a98e8346d0e2eb5396f0a8905
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector
@@ -43,7 +43,7 @@ spec:
             - --config=/conf/relay.yaml
           securityContext:
             {}
-          image: "otel/opentelemetry-collector-k8s:0.115.1"
+          image: "otel/opentelemetry-collector-k8s:0.118.0"
           imagePullPolicy: IfNotPresent
           ports:
 

diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml
@@ -6,9 +6,9 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: agent-collector
diff --git a/.../opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml b/.../opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml
@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: agent-collector
 data:

diff --git a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml
@@ -6,10 +6,10 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: agent-collector
 spec:
@@ -23,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: aa19ead4f4ad956b91de0f254094744895a8fb3bf6f534ea6631f555f20fd273
+        checksum/config: 8137278a695ef3dad6c47ca7890190d1666a320cf7f801b6c173b736046088b7
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector
@@ -43,7 +43,7 @@ spec:
             - --config=/conf/relay.yaml
           securityContext:
             {}
-          image: "otel/opentelemetry-collector-k8s:0.115.1"
+          image: "otel/opentelemetry-collector-k8s:0.118.0"
           imagePullPolicy: IfNotPresent
           ports:
 

diff --git a/...s/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml b/...s/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml
@@ -6,9 +6,9 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.111.2
+    helm.sh/chart: opentelemetry-collector-0.115.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: "0.115.1"
+    app.kubernetes.io/version: "0.118.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: agent-collector