[collector] support add additionalLabels for otel col resources (open…

…-telemetry#968) * support add additionalLabels for all resources * add comments * Update charts/opentelemetry-collector/values.yaml Co-authored-by: Jina Jain <[email protected]> * add comments * Update charts/opentelemetry-collector/values.yaml Co-authored-by: Tyler Helmuth <[email protected]> --------- Co-authored-by: Jina Jain <[email protected]> Co-authored-by: Tyler Helmuth <[email protected]>
giffgaff · Jul 22, 2024 · 741b5b2 · 741b5b2
1 parent 80f7f46
commit 741b5b2
Show file tree

Hide file tree

Showing 47 changed files with 101 additions and 55 deletions.
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.74.1
+version: 0.74.2
 description: OpenTelemetry Collector Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/

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,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
 data:
   relay: |
     exporters:

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,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
 data:
   relay: |
     exporters:

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,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
 spec:
   selector:
     matchLabels:
@@ -22,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 0b15386e43e068c6ebe4c4599f0136ecbd0afd2dccdef53963b296935a8b9e32
+        checksum/config: bb65602a02a78f7c82b4bbff68a34d6def5d457a5c464933f67be0c5e2efcc99
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

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,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
 spec:
   replicas: 1
   revisionHistoryLimit: 10
@@ -24,7 +25,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 7023632f5ae9f2bc503e44f13f87843863026c69e43b7f38db6d99be59f08e7e
+        checksum/config: 85eebfedba2d58ea7cd8bda6c8e946608e1a5005395ddcc8c64461ada8c14516
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

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,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
     component: standalone-collector
 spec:
   type: ClusterIP

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,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"

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,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
 data:
   relay: |
     exporters:

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,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
 spec:
   selector:
     matchLabels:
@@ -22,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 3ef7cec9bf589bfce7e983369836fb61574a93fa61dca41eba67764dfe85f590
+        checksum/config: 3f6327adb6da5c85daad977e3b3bdc1a9714ab68dcb236035d2460793dfb4437
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

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,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"

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,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
 data:
   relay: |
     exporters:

diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml
@@ -6,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
 spec:
   selector:
     matchLabels:
@@ -22,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: d3dbaacbaa7e1904c5a1bd44abd823fdc154605e9c685df20bd2c616fd69e938
+        checksum/config: 5e01d5015d0985240f6e01399cd999f92a59539f638604a34dfeda7d6047d9b4
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml
@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"

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,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
 data:
   relay: |
     exporters:

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,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
 spec:
   selector:
     matchLabels:
@@ -22,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 881ee4f4175f3a1b984618875b00312eac21aaa72b77401f3ddbfa3fb26d4493
+        checksum/config: 1194a1d17f8f9e09efce799d09d85c962cbd0f6523a09f4bf5a0c3ce920cc735
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

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,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"

diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml
@@ -6,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
 data:
   relay: |
     exporters:

diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml
@@ -6,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
 spec:
   selector:
     matchLabels:
@@ -22,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 881ee4f4175f3a1b984618875b00312eac21aaa72b77401f3ddbfa3fb26d4493
+        checksum/config: 1194a1d17f8f9e09efce799d09d85c962cbd0f6523a09f4bf5a0c3ce920cc735
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml
@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"

diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml
@@ -6,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
 data:
   relay: |
     exporters:

diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml
@@ -6,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
 spec:
   replicas: 3
   revisionHistoryLimit: 10
@@ -24,7 +25,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 7023632f5ae9f2bc503e44f13f87843863026c69e43b7f38db6d99be59f08e7e
+        checksum/config: 85eebfedba2d58ea7cd8bda6c8e946608e1a5005395ddcc8c64461ada8c14516
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml
@@ -6,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
     component: standalone-collector
 spec:
   type: ClusterIP

diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml
@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"

diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml
@@ -6,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
 data:
   relay: |
     exporters:

diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml
@@ -6,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
 spec:
   replicas: 1
   revisionHistoryLimit: 10
@@ -24,7 +25,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 9ae10f743eb72d7a0bb2df50d7318725363e8cdcaedc42423a7d292361328267
+        checksum/config: 1ae576ab1132625f2d34a4d4eb3bdceceed05579c70638df166176bfbb3fc6cb
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml
@@ -6,11 +6,12 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.74.1
+    helm.sh/chart: opentelemetry-collector-0.74.2
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.89.0"
     app.kubernetes.io/managed-by: Helm
+
     component: standalone-collector
 spec:
   type: ClusterIP