From 741b5b2179cff695ff2eaee16448c5bfe53b7cc8 Mon Sep 17 00:00:00 2001 From: Jared Tan Date: Tue, 28 Nov 2023 23:36:24 +0800 Subject: [PATCH] [collector] support add additionalLabels for otel col resources (#968) * support add additionalLabels for all resources * add comments * Update charts/opentelemetry-collector/values.yaml Co-authored-by: Jina Jain * add comments * Update charts/opentelemetry-collector/values.yaml Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> --------- Co-authored-by: Jina Jain Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> --- charts/opentelemetry-collector/Chart.yaml | 2 +- .../daemonset-and-deployment/rendered/configmap-agent.yaml | 3 ++- .../daemonset-and-deployment/rendered/configmap.yaml | 3 ++- .../daemonset-and-deployment/rendered/daemonset.yaml | 5 +++-- .../daemonset-and-deployment/rendered/deployment.yaml | 5 +++-- .../daemonset-and-deployment/rendered/service.yaml | 3 ++- .../daemonset-and-deployment/rendered/serviceaccount.yaml | 2 +- .../daemonset-collector-logs/rendered/configmap-agent.yaml | 3 ++- .../daemonset-collector-logs/rendered/daemonset.yaml | 5 +++-- .../daemonset-collector-logs/rendered/serviceaccount.yaml | 2 +- .../daemonset-hostmetrics/rendered/configmap-agent.yaml | 3 ++- .../examples/daemonset-hostmetrics/rendered/daemonset.yaml | 5 +++-- .../daemonset-hostmetrics/rendered/serviceaccount.yaml | 2 +- .../rendered/configmap-agent.yaml | 3 ++- .../daemonset-lifecycle-hooks/rendered/daemonset.yaml | 5 +++-- .../daemonset-lifecycle-hooks/rendered/serviceaccount.yaml | 2 +- .../examples/daemonset-only/rendered/configmap-agent.yaml | 3 ++- .../examples/daemonset-only/rendered/daemonset.yaml | 5 +++-- .../examples/daemonset-only/rendered/serviceaccount.yaml | 2 +- .../examples/deployment-only/rendered/configmap.yaml | 3 ++- .../examples/deployment-only/rendered/deployment.yaml | 5 +++-- .../examples/deployment-only/rendered/service.yaml | 3 ++- .../examples/deployment-only/rendered/serviceaccount.yaml | 2 +- .../deployment-otlp-traces/rendered/configmap.yaml | 3 ++- .../deployment-otlp-traces/rendered/deployment.yaml | 5 +++-- .../examples/deployment-otlp-traces/rendered/service.yaml | 3 ++- .../deployment-otlp-traces/rendered/serviceaccount.yaml | 2 +- .../rendered/deployment.yaml | 3 ++- .../rendered/service.yaml | 3 ++- .../rendered/serviceaccount.yaml | 2 +- .../kubernetesAttributes/rendered/clusterrole.yaml | 3 ++- .../kubernetesAttributes/rendered/clusterrolebinding.yaml | 3 ++- .../examples/kubernetesAttributes/rendered/configmap.yaml | 3 ++- .../examples/kubernetesAttributes/rendered/deployment.yaml | 5 +++-- .../examples/kubernetesAttributes/rendered/service.yaml | 3 ++- .../kubernetesAttributes/rendered/serviceaccount.yaml | 2 +- .../statefulset-only/rendered/configmap-statefulset.yaml | 3 ++- .../examples/statefulset-only/rendered/service.yaml | 3 ++- .../examples/statefulset-only/rendered/serviceaccount.yaml | 2 +- .../examples/statefulset-only/rendered/statefulset.yaml | 5 +++-- .../examples/using-GOMEMLIMIT/rendered/configmap.yaml | 3 ++- .../examples/using-GOMEMLIMIT/rendered/deployment.yaml | 5 +++-- .../examples/using-GOMEMLIMIT/rendered/service.yaml | 3 ++- .../examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml | 2 +- charts/opentelemetry-collector/templates/_helpers.tpl | 7 +++++++ charts/opentelemetry-collector/values.schema.json | 3 +++ charts/opentelemetry-collector/values.yaml | 4 ++++ 47 files changed, 101 insertions(+), 55 deletions(-) diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml index 5ec48663d..854fa77a2 100644 --- 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/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml index dc7abf593..ed839cb60 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml +++ b/charts/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 index d73b6fb5b..36a78be62 100644 --- 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 index c36d03781..9fa6946a4 100644 --- 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 index b0cfb8b47..1f97ef7b0 100644 --- 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 index 5ed1a2bd6..82752c2a4 100644 --- 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/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml index e877cdc43..a828bff72 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml +++ b/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.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-collector-logs/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml index 0646acb75..cdb8fae5c 100644 --- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml +++ b/charts/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 index 2025be911..e87cd193b 100644 --- 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/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml index e877cdc43..a828bff72 100644 --- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml +++ b/charts/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 index 0b2c92f91..9e9547fce 100644 --- 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 index f5d796c26..25a2c1c9c 100644 --- 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 index e877cdc43..a828bff72 100644 --- 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/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml index c937a814e..21494c71d 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml +++ b/charts/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 index 24940b53b..86689c22a 100644 --- 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/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml index e877cdc43..a828bff72 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml +++ b/charts/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 index c937a814e..21494c71d 100644 --- 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 index 2406418b4..d999c46f6 100644 --- 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 index e877cdc43..a828bff72 100644 --- 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 index d73b6fb5b..36a78be62 100644 --- 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 index 493aa0e7a..0bf295aea 100644 --- 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 index 5ed1a2bd6..82752c2a4 100644 --- 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 index e877cdc43..a828bff72 100644 --- 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 index 3d305e2c8..c5f376d81 100644 --- 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 index 12f7d0698..ddb2e3ec4 100644 --- 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 index 7a53aa1f7..e7d3bf5d3 100644 --- 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 diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml index e877cdc43..a828bff72 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/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-use-existing-configMap/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml index 43b803307..5731aa4d5 100644 --- a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/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 diff --git a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml index 5ed1a2bd6..82752c2a4 100644 --- a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/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-use-existing-configMap/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml index e877cdc43..a828bff72 100644 --- a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/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/kubernetesAttributes/rendered/clusterrole.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml index 80eab6b62..1ff88ea87 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml @@ -5,11 +5,12 @@ kind: ClusterRole metadata: name: example-opentelemetry-collector 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 + rules: - apiGroups: [""] resources: ["pods", "namespaces"] diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml index 887eab5aa..0a13dcc48 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml @@ -5,11 +5,12 @@ kind: ClusterRoleBinding metadata: name: example-opentelemetry-collector 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 + roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml index a2b84f67b..90909166d 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/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/kubernetesAttributes/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml index c38598721..e0a51e6b2 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/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: e26979c7d686f7d9fa1ba78085b94d180c2f1c787d187d49254b286e6a6a3d3e + checksum/config: 651341a7c4b3c1b028bb7d6dd7ab68e433452e25a7ce2383717bf457245de18f labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml index 5ed1a2bd6..82752c2a4 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/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/kubernetesAttributes/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml index e877cdc43..a828bff72 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/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/statefulset-only/rendered/configmap-statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml index d0f4f4709..10c6cd590 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml @@ -6,11 +6,12 @@ metadata: name: example-opentelemetry-collector-statefulset 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/statefulset-only/rendered/service.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml index fc093ff22..7bfa9e323 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-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: statefulset-collector spec: type: ClusterIP diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml index e877cdc43..a828bff72 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-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/statefulset-only/rendered/statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml index 57b963c4a..1d8884230 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.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: serviceName: example-opentelemetry-collector podManagementPolicy: Parallel @@ -25,7 +26,7 @@ spec: template: metadata: annotations: - checksum/config: ae0bd4b9450f46f9a6a229a8901f2f482acc39e5133f5c5695a7563d21a3b46b + checksum/config: 7683149fe7ad8e009eb2f64c3b265f66b9f23e5d44961d8328a0f720764e76e9 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml index f50f45034..c606c3eb9 100644 --- a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/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/using-GOMEMLIMIT/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml index f6b50b827..06b53cddc 100644 --- a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/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: 7fb9029d17d2ff22981ebfaf3ca306b537ae9258cfe50155e5c4d78944fb544b + checksum/config: b55d6fb539869687c0b9496224b31e60e80305a59cabc74eb0fe9723ba69c5f7 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml index 5ed1a2bd6..82752c2a4 100644 --- a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/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/using-GOMEMLIMIT/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml index e877cdc43..a828bff72 100644 --- a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/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/templates/_helpers.tpl b/charts/opentelemetry-collector/templates/_helpers.tpl index 32329ade7..20be19aa9 100644 --- a/charts/opentelemetry-collector/templates/_helpers.tpl +++ b/charts/opentelemetry-collector/templates/_helpers.tpl @@ -59,6 +59,7 @@ helm.sh/chart: {{ include "opentelemetry-collector.chart" . }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} +{{ include "opentelemetry-collector.additionalLabels" . }} {{- end }} {{/* @@ -107,6 +108,12 @@ Create the name of the clusterRoleBinding to use {{- end }} {{- end }} +{{- define "opentelemetry-collector.additionalLabels" -}} +{{- if .Values.additionalLabels }} +{{- tpl (.Values.additionalLabels | toYaml) . }} +{{- end }} +{{- end }} + {{/* Return the appropriate apiVersion for podDisruptionBudget. */}} diff --git a/charts/opentelemetry-collector/values.schema.json b/charts/opentelemetry-collector/values.schema.json index 3bc0b0e2d..9819327ef 100644 --- a/charts/opentelemetry-collector/values.schema.json +++ b/charts/opentelemetry-collector/values.schema.json @@ -542,6 +542,9 @@ "podLabels": { "type": "object" }, + "additionalLabels": { + "type": "object" + }, "hostNetwork": { "type": "boolean" }, diff --git a/charts/opentelemetry-collector/values.yaml b/charts/opentelemetry-collector/values.yaml index 96c6fd2f2..0e4727ccc 100644 --- a/charts/opentelemetry-collector/values.yaml +++ b/charts/opentelemetry-collector/values.yaml @@ -295,6 +295,10 @@ podAnnotations: {} podLabels: {} +# Common labels to add to all otel-collector resources. Evaluated as a template. +additionalLabels: {} +# app.kubernetes.io/part-of: my-app + # Host networking requested for this pod. Use the host's network namespace. hostNetwork: false