From 8bcb36e02163a90d89832e3cb5854a62fbdb3dd8 Mon Sep 17 00:00:00 2001 From: Jared Tan Date: Sat, 18 Nov 2023 21:44:26 +0800 Subject: [PATCH 1/2] fix clusterrolebinding binding wrong namespace --- charts/opentelemetry-collector/Chart.yaml | 2 +- .../ci/namespace-override.yaml | 6 ++ .../rendered/configmap-agent.yaml | 2 +- .../rendered/configmap.yaml | 2 +- .../rendered/daemonset.yaml | 4 +- .../rendered/deployment.yaml | 4 +- .../rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/configmap-agent.yaml | 2 +- .../rendered/daemonset.yaml | 4 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/configmap-agent.yaml | 2 +- .../rendered/daemonset.yaml | 4 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/configmap-agent.yaml | 2 +- .../rendered/daemonset.yaml | 4 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/configmap-agent.yaml | 2 +- .../daemonset-only/rendered/daemonset.yaml | 4 +- .../rendered/serviceaccount.yaml | 2 +- .../deployment-only/rendered/configmap.yaml | 2 +- .../deployment-only/rendered/deployment.yaml | 4 +- .../deployment-only/rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/configmap.yaml | 2 +- .../rendered/deployment.yaml | 4 +- .../rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/deployment.yaml | 2 +- .../rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/clusterrole.yaml | 2 +- .../rendered/clusterrolebinding.yaml | 2 +- .../rendered/configmap.yaml | 2 +- .../rendered/deployment.yaml | 4 +- .../rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/clusterrole.yaml | 13 +++ .../rendered/clusterrolebinding.yaml | 20 ++++ .../rendered/configmap.yaml | 88 ++++++++++++++++++ .../rendered/deployment.yaml | 92 +++++++++++++++++++ .../namespace-override/rendered/service.yaml | 48 ++++++++++ .../rendered/serviceaccount.yaml | 13 +++ .../examples/namespace-override/values.yaml | 6 ++ .../rendered/configmap-statefulset.yaml | 2 +- .../statefulset-only/rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/statefulset.yaml | 4 +- .../using-GOMEMLIMIT/rendered/configmap.yaml | 2 +- .../using-GOMEMLIMIT/rendered/deployment.yaml | 4 +- .../using-GOMEMLIMIT/rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../templates/clusterrolebinding.yaml | 4 +- 53 files changed, 343 insertions(+), 57 deletions(-) create mode 100644 charts/opentelemetry-collector/ci/namespace-override.yaml create mode 100644 charts/opentelemetry-collector/examples/namespace-override/rendered/clusterrole.yaml create mode 100644 charts/opentelemetry-collector/examples/namespace-override/rendered/clusterrolebinding.yaml create mode 100644 charts/opentelemetry-collector/examples/namespace-override/rendered/configmap.yaml create mode 100644 charts/opentelemetry-collector/examples/namespace-override/rendered/deployment.yaml create mode 100644 charts/opentelemetry-collector/examples/namespace-override/rendered/service.yaml create mode 100644 charts/opentelemetry-collector/examples/namespace-override/rendered/serviceaccount.yaml create mode 100644 charts/opentelemetry-collector/examples/namespace-override/values.yaml diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml index d2096c4f3..5ec48663d 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.0 +version: 0.74.1 description: OpenTelemetry Collector Helm chart for Kubernetes type: application home: https://opentelemetry.io/ diff --git a/charts/opentelemetry-collector/ci/namespace-override.yaml b/charts/opentelemetry-collector/ci/namespace-override.yaml new file mode 100644 index 000000000..dfcc70f7f --- /dev/null +++ b/charts/opentelemetry-collector/ci/namespace-override.yaml @@ -0,0 +1,6 @@ +mode: deployment + +namespaceOverride: "my-otel-ns" + +clusterRole: + create: true 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 7d18f067f..dc7abf593 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,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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-and-deployment/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml index 397fb4b8a..d73b6fb5b 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml +++ b/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.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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-and-deployment/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml index bd82a139b..c36d03781 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml +++ b/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.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.89.0" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: 01184e5e9de023a07fc6fff4fd908b338a436bb2a5ccd3cfaf080bc3a6fd5866 + checksum/config: 0b15386e43e068c6ebe4c4599f0136ecbd0afd2dccdef53963b296935a8b9e32 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 d123e43b7..b0cfb8b47 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml +++ b/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.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.89.0" @@ -24,7 +24,7 @@ spec: template: metadata: annotations: - checksum/config: 95e1e1d5a95399256031de1508e329434b039bd6c4f1e64ef1705f60ad2cce07 + checksum/config: 7023632f5ae9f2bc503e44f13f87843863026c69e43b7f38db6d99be59f08e7e 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 0d6f54aea..5ed1a2bd6 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml +++ b/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.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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-and-deployment/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml index eeefe861d..e877cdc43 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.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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 06f6fac08..0646acb75 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,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml index c7c1a8bf4..2025be911 100644 --- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.89.0" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: 6389ba491c0ba48375d4cac1d9c90997975807253df2870d664287876a744672 + checksum/config: 3ef7cec9bf589bfce7e983369836fb61574a93fa61dca41eba67764dfe85f590 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 eeefe861d..e877cdc43 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.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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 78c88d846..0b2c92f91 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml index a6b7b5c39..f5d796c26 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.89.0" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: 7936e4ec43b707e512c0bcd1ee85f228df12e528929fb862b472b3dc0041b095 + checksum/config: d3dbaacbaa7e1904c5a1bd44abd823fdc154605e9c685df20bd2c616fd69e938 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 eeefe861d..e877cdc43 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.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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 b18c86eb3..c937a814e 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,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml index a6f2cba5e..24940b53b 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.89.0" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: fd4bccdc394bafb0b2166bb889a194cabb75363f093282e78fef93bc6fa74fc2 + checksum/config: 881ee4f4175f3a1b984618875b00312eac21aaa72b77401f3ddbfa3fb26d4493 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 eeefe861d..e877cdc43 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.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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 b18c86eb3..c937a814e 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml index ca8678e21..2406418b4 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-agent namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.89.0" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: fd4bccdc394bafb0b2166bb889a194cabb75363f093282e78fef93bc6fa74fc2 + checksum/config: 881ee4f4175f3a1b984618875b00312eac21aaa72b77401f3ddbfa3fb26d4493 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 eeefe861d..e877cdc43 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.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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 397fb4b8a..d73b6fb5b 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml index 262bd0fd6..493aa0e7a 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.89.0" @@ -24,7 +24,7 @@ spec: template: metadata: annotations: - checksum/config: 95e1e1d5a95399256031de1508e329434b039bd6c4f1e64ef1705f60ad2cce07 + checksum/config: 7023632f5ae9f2bc503e44f13f87843863026c69e43b7f38db6d99be59f08e7e 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 0d6f54aea..5ed1a2bd6 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml index eeefe861d..e877cdc43 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.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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 ef4e7a031..3d305e2c8 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml index c405facbc..12f7d0698 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.89.0" @@ -24,7 +24,7 @@ spec: template: metadata: annotations: - checksum/config: 7922399ee21a10b0b21231b49ead2c5a5d854557a145579f1610be3d8185f059 + checksum/config: 9ae10f743eb72d7a0bb2df50d7318725363e8cdcaedc42423a7d292361328267 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 b6bbdbccc..7a53aa1f7 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml index eeefe861d..e877cdc43 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.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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 0765ab1c3..43b803307 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,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/service.yaml b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml index 0d6f54aea..5ed1a2bd6 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,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml index eeefe861d..e877cdc43 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.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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 9357f417e..80eab6b62 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml @@ -5,7 +5,7 @@ kind: ClusterRole metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/clusterrolebinding.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml index 668b95696..887eab5aa 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml @@ -5,7 +5,7 @@ kind: ClusterRoleBinding metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/configmap.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml index 02ac8a2da..a2b84f67b 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/deployment.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml index a962a8955..c38598721 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.89.0" @@ -24,7 +24,7 @@ spec: template: metadata: annotations: - checksum/config: 69e127e9e8fe84b578247cc2d2181d3a82998f7d0d3faaf440be06a608810908 + checksum/config: e26979c7d686f7d9fa1ba78085b94d180c2f1c787d187d49254b286e6a6a3d3e 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 0d6f54aea..5ed1a2bd6 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/serviceaccount.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml index eeefe861d..e877cdc43 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.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/namespace-override/rendered/clusterrole.yaml b/charts/opentelemetry-collector/examples/namespace-override/rendered/clusterrole.yaml new file mode 100644 index 000000000..66de8ce2b --- /dev/null +++ b/charts/opentelemetry-collector/examples/namespace-override/rendered/clusterrole.yaml @@ -0,0 +1,13 @@ +--- +# Source: opentelemetry-collector/templates/clusterrole.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: example-opentelemetry-collector + labels: + helm.sh/chart: opentelemetry-collector-0.74.1 + 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: diff --git a/charts/opentelemetry-collector/examples/namespace-override/rendered/clusterrolebinding.yaml b/charts/opentelemetry-collector/examples/namespace-override/rendered/clusterrolebinding.yaml new file mode 100644 index 000000000..f72981b8f --- /dev/null +++ b/charts/opentelemetry-collector/examples/namespace-override/rendered/clusterrolebinding.yaml @@ -0,0 +1,20 @@ +--- +# Source: opentelemetry-collector/templates/clusterrolebinding.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: example-opentelemetry-collector + labels: + helm.sh/chart: opentelemetry-collector-0.74.1 + 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 + name: example-opentelemetry-collector +subjects: +- kind: ServiceAccount + name: example-opentelemetry-collector + namespace: my-otel-ns diff --git a/charts/opentelemetry-collector/examples/namespace-override/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/namespace-override/rendered/configmap.yaml new file mode 100644 index 000000000..11a219d39 --- /dev/null +++ b/charts/opentelemetry-collector/examples/namespace-override/rendered/configmap.yaml @@ -0,0 +1,88 @@ +--- +# Source: opentelemetry-collector/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: example-opentelemetry-collector + namespace: my-otel-ns + labels: + helm.sh/chart: opentelemetry-collector-0.74.1 + 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: + debug: {} + logging: {} + extensions: + health_check: {} + memory_ballast: + size_in_percentage: 40 + processors: + batch: {} + memory_limiter: + check_interval: 5s + limit_percentage: 80 + spike_limit_percentage: 25 + receivers: + jaeger: + protocols: + grpc: + endpoint: ${env:MY_POD_IP}:14250 + thrift_compact: + endpoint: ${env:MY_POD_IP}:6831 + thrift_http: + endpoint: ${env:MY_POD_IP}:14268 + otlp: + protocols: + grpc: + endpoint: ${env:MY_POD_IP}:4317 + http: + endpoint: ${env:MY_POD_IP}:4318 + prometheus: + config: + scrape_configs: + - job_name: opentelemetry-collector + scrape_interval: 10s + static_configs: + - targets: + - ${env:MY_POD_IP}:8888 + zipkin: + endpoint: ${env:MY_POD_IP}:9411 + service: + extensions: + - health_check + - memory_ballast + pipelines: + logs: + exporters: + - debug + processors: + - memory_limiter + - batch + receivers: + - otlp + metrics: + exporters: + - debug + processors: + - memory_limiter + - batch + receivers: + - otlp + - prometheus + traces: + exporters: + - debug + processors: + - memory_limiter + - batch + receivers: + - otlp + - jaeger + - zipkin + telemetry: + metrics: + address: ${env:MY_POD_IP}:8888 diff --git a/charts/opentelemetry-collector/examples/namespace-override/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/namespace-override/rendered/deployment.yaml new file mode 100644 index 000000000..6ac31d09b --- /dev/null +++ b/charts/opentelemetry-collector/examples/namespace-override/rendered/deployment.yaml @@ -0,0 +1,92 @@ +--- +# Source: opentelemetry-collector/templates/deployment.yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: example-opentelemetry-collector + namespace: my-otel-ns + labels: + helm.sh/chart: opentelemetry-collector-0.74.1 + 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 + selector: + matchLabels: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + component: standalone-collector + strategy: + type: RollingUpdate + template: + metadata: + annotations: + checksum/config: a2998ba701d2e066a58137a8b81fd2cbe8f9dc002e6a938251df2ee5ff2ded55 + + labels: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + component: standalone-collector + + spec: + + serviceAccountName: example-opentelemetry-collector + securityContext: + {} + containers: + - name: opentelemetry-collector + command: + - /otelcol-contrib + - --config=/conf/relay.yaml + securityContext: + {} + image: "otel/opentelemetry-collector-contrib:0.89.0" + imagePullPolicy: IfNotPresent + ports: + + - name: jaeger-compact + containerPort: 6831 + protocol: UDP + - name: jaeger-grpc + containerPort: 14250 + protocol: TCP + - name: jaeger-thrift + containerPort: 14268 + protocol: TCP + - name: otlp + containerPort: 4317 + protocol: TCP + - name: otlp-http + containerPort: 4318 + protocol: TCP + - name: zipkin + containerPort: 9411 + protocol: TCP + env: + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP + livenessProbe: + httpGet: + path: / + port: 13133 + readinessProbe: + httpGet: + path: / + port: 13133 + volumeMounts: + - mountPath: /conf + name: opentelemetry-collector-configmap + volumes: + - name: opentelemetry-collector-configmap + configMap: + name: example-opentelemetry-collector + items: + - key: relay + path: relay.yaml + hostNetwork: false diff --git a/charts/opentelemetry-collector/examples/namespace-override/rendered/service.yaml b/charts/opentelemetry-collector/examples/namespace-override/rendered/service.yaml new file mode 100644 index 000000000..78a201a16 --- /dev/null +++ b/charts/opentelemetry-collector/examples/namespace-override/rendered/service.yaml @@ -0,0 +1,48 @@ +--- +# Source: opentelemetry-collector/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: example-opentelemetry-collector + namespace: my-otel-ns + labels: + helm.sh/chart: opentelemetry-collector-0.74.1 + 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 + ports: + + - name: jaeger-compact + port: 6831 + targetPort: 6831 + protocol: UDP + - name: jaeger-grpc + port: 14250 + targetPort: 14250 + protocol: TCP + - name: jaeger-thrift + port: 14268 + targetPort: 14268 + protocol: TCP + - name: otlp + port: 4317 + targetPort: 4317 + protocol: TCP + appProtocol: grpc + - name: otlp-http + port: 4318 + targetPort: 4318 + protocol: TCP + - name: zipkin + port: 9411 + targetPort: 9411 + protocol: TCP + selector: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + component: standalone-collector + internalTrafficPolicy: Cluster diff --git a/charts/opentelemetry-collector/examples/namespace-override/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/namespace-override/rendered/serviceaccount.yaml new file mode 100644 index 000000000..8a571c391 --- /dev/null +++ b/charts/opentelemetry-collector/examples/namespace-override/rendered/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: opentelemetry-collector/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: example-opentelemetry-collector + namespace: my-otel-ns + labels: + helm.sh/chart: opentelemetry-collector-0.74.1 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.89.0" + app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/namespace-override/values.yaml b/charts/opentelemetry-collector/examples/namespace-override/values.yaml new file mode 100644 index 000000000..dfcc70f7f --- /dev/null +++ b/charts/opentelemetry-collector/examples/namespace-override/values.yaml @@ -0,0 +1,6 @@ +mode: deployment + +namespaceOverride: "my-otel-ns" + +clusterRole: + create: true 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 8ceedb0ea..d0f4f4709 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-statefulset namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/service.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml index e604a0cbe..fc093ff22 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/serviceaccount.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml index eeefe861d..e877cdc43 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.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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 67e194456..57b963c4a 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.89.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 611050678ab9b3ca3327cff789cce13db1f04748ad0ea3ad7d1561f869198d90 + checksum/config: ae0bd4b9450f46f9a6a229a8901f2f482acc39e5133f5c5695a7563d21a3b46b 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 f3b632e67..f50f45034 100644 --- a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/using-GOMEMLIMIT/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml index 217e9ab2b..f6b50b827 100644 --- a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.89.0" @@ -24,7 +24,7 @@ spec: template: metadata: annotations: - checksum/config: 3f9ad9765920b010486766611b653d2c4a754ae27e6739db347827d551faa822 + checksum/config: 7fb9029d17d2ff22981ebfaf3ca306b537ae9258cfe50155e5c4d78944fb544b 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 0d6f54aea..5ed1a2bd6 100644 --- a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.74.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/using-GOMEMLIMIT/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml index eeefe861d..e877cdc43 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.0 + helm.sh/chart: opentelemetry-collector-0.74.1 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/clusterrolebinding.yaml b/charts/opentelemetry-collector/templates/clusterrolebinding.yaml index 6f8c42aa5..e0da0c95a 100644 --- a/charts/opentelemetry-collector/templates/clusterrolebinding.yaml +++ b/charts/opentelemetry-collector/templates/clusterrolebinding.yaml @@ -18,5 +18,5 @@ roleRef: subjects: - kind: ServiceAccount name: {{ include "opentelemetry-collector.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} -{{- end }} \ No newline at end of file + namespace: {{ include "opentelemetry-collector.namespace" . }} +{{- end }} From aca6d3de309cbee9e2804e3f54e470e63eb0dcb4 Mon Sep 17 00:00:00 2001 From: Jared Tan Date: Tue, 21 Nov 2023 09:22:40 +0800 Subject: [PATCH 2/2] remove examples --- .../ci/namespace-override.yaml | 6 -- .../rendered/clusterrole.yaml | 13 --- .../rendered/clusterrolebinding.yaml | 20 ---- .../rendered/configmap.yaml | 88 ------------------ .../rendered/deployment.yaml | 92 ------------------- .../namespace-override/rendered/service.yaml | 48 ---------- .../rendered/serviceaccount.yaml | 13 --- .../examples/namespace-override/values.yaml | 6 -- 8 files changed, 286 deletions(-) delete mode 100644 charts/opentelemetry-collector/ci/namespace-override.yaml delete mode 100644 charts/opentelemetry-collector/examples/namespace-override/rendered/clusterrole.yaml delete mode 100644 charts/opentelemetry-collector/examples/namespace-override/rendered/clusterrolebinding.yaml delete mode 100644 charts/opentelemetry-collector/examples/namespace-override/rendered/configmap.yaml delete mode 100644 charts/opentelemetry-collector/examples/namespace-override/rendered/deployment.yaml delete mode 100644 charts/opentelemetry-collector/examples/namespace-override/rendered/service.yaml delete mode 100644 charts/opentelemetry-collector/examples/namespace-override/rendered/serviceaccount.yaml delete mode 100644 charts/opentelemetry-collector/examples/namespace-override/values.yaml diff --git a/charts/opentelemetry-collector/ci/namespace-override.yaml b/charts/opentelemetry-collector/ci/namespace-override.yaml deleted file mode 100644 index dfcc70f7f..000000000 --- a/charts/opentelemetry-collector/ci/namespace-override.yaml +++ /dev/null @@ -1,6 +0,0 @@ -mode: deployment - -namespaceOverride: "my-otel-ns" - -clusterRole: - create: true diff --git a/charts/opentelemetry-collector/examples/namespace-override/rendered/clusterrole.yaml b/charts/opentelemetry-collector/examples/namespace-override/rendered/clusterrole.yaml deleted file mode 100644 index 66de8ce2b..000000000 --- a/charts/opentelemetry-collector/examples/namespace-override/rendered/clusterrole.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: opentelemetry-collector/templates/clusterrole.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: example-opentelemetry-collector - labels: - helm.sh/chart: opentelemetry-collector-0.74.1 - 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: diff --git a/charts/opentelemetry-collector/examples/namespace-override/rendered/clusterrolebinding.yaml b/charts/opentelemetry-collector/examples/namespace-override/rendered/clusterrolebinding.yaml deleted file mode 100644 index f72981b8f..000000000 --- a/charts/opentelemetry-collector/examples/namespace-override/rendered/clusterrolebinding.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -# Source: opentelemetry-collector/templates/clusterrolebinding.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: example-opentelemetry-collector - labels: - helm.sh/chart: opentelemetry-collector-0.74.1 - 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 - name: example-opentelemetry-collector -subjects: -- kind: ServiceAccount - name: example-opentelemetry-collector - namespace: my-otel-ns diff --git a/charts/opentelemetry-collector/examples/namespace-override/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/namespace-override/rendered/configmap.yaml deleted file mode 100644 index 11a219d39..000000000 --- a/charts/opentelemetry-collector/examples/namespace-override/rendered/configmap.yaml +++ /dev/null @@ -1,88 +0,0 @@ ---- -# Source: opentelemetry-collector/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: example-opentelemetry-collector - namespace: my-otel-ns - labels: - helm.sh/chart: opentelemetry-collector-0.74.1 - 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: - debug: {} - logging: {} - extensions: - health_check: {} - memory_ballast: - size_in_percentage: 40 - processors: - batch: {} - memory_limiter: - check_interval: 5s - limit_percentage: 80 - spike_limit_percentage: 25 - receivers: - jaeger: - protocols: - grpc: - endpoint: ${env:MY_POD_IP}:14250 - thrift_compact: - endpoint: ${env:MY_POD_IP}:6831 - thrift_http: - endpoint: ${env:MY_POD_IP}:14268 - otlp: - protocols: - grpc: - endpoint: ${env:MY_POD_IP}:4317 - http: - endpoint: ${env:MY_POD_IP}:4318 - prometheus: - config: - scrape_configs: - - job_name: opentelemetry-collector - scrape_interval: 10s - static_configs: - - targets: - - ${env:MY_POD_IP}:8888 - zipkin: - endpoint: ${env:MY_POD_IP}:9411 - service: - extensions: - - health_check - - memory_ballast - pipelines: - logs: - exporters: - - debug - processors: - - memory_limiter - - batch - receivers: - - otlp - metrics: - exporters: - - debug - processors: - - memory_limiter - - batch - receivers: - - otlp - - prometheus - traces: - exporters: - - debug - processors: - - memory_limiter - - batch - receivers: - - otlp - - jaeger - - zipkin - telemetry: - metrics: - address: ${env:MY_POD_IP}:8888 diff --git a/charts/opentelemetry-collector/examples/namespace-override/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/namespace-override/rendered/deployment.yaml deleted file mode 100644 index 6ac31d09b..000000000 --- a/charts/opentelemetry-collector/examples/namespace-override/rendered/deployment.yaml +++ /dev/null @@ -1,92 +0,0 @@ ---- -# Source: opentelemetry-collector/templates/deployment.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-opentelemetry-collector - namespace: my-otel-ns - labels: - helm.sh/chart: opentelemetry-collector-0.74.1 - 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 - selector: - matchLabels: - app.kubernetes.io/name: opentelemetry-collector - app.kubernetes.io/instance: example - component: standalone-collector - strategy: - type: RollingUpdate - template: - metadata: - annotations: - checksum/config: a2998ba701d2e066a58137a8b81fd2cbe8f9dc002e6a938251df2ee5ff2ded55 - - labels: - app.kubernetes.io/name: opentelemetry-collector - app.kubernetes.io/instance: example - component: standalone-collector - - spec: - - serviceAccountName: example-opentelemetry-collector - securityContext: - {} - containers: - - name: opentelemetry-collector - command: - - /otelcol-contrib - - --config=/conf/relay.yaml - securityContext: - {} - image: "otel/opentelemetry-collector-contrib:0.89.0" - imagePullPolicy: IfNotPresent - ports: - - - name: jaeger-compact - containerPort: 6831 - protocol: UDP - - name: jaeger-grpc - containerPort: 14250 - protocol: TCP - - name: jaeger-thrift - containerPort: 14268 - protocol: TCP - - name: otlp - containerPort: 4317 - protocol: TCP - - name: otlp-http - containerPort: 4318 - protocol: TCP - - name: zipkin - containerPort: 9411 - protocol: TCP - env: - - name: MY_POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - livenessProbe: - httpGet: - path: / - port: 13133 - readinessProbe: - httpGet: - path: / - port: 13133 - volumeMounts: - - mountPath: /conf - name: opentelemetry-collector-configmap - volumes: - - name: opentelemetry-collector-configmap - configMap: - name: example-opentelemetry-collector - items: - - key: relay - path: relay.yaml - hostNetwork: false diff --git a/charts/opentelemetry-collector/examples/namespace-override/rendered/service.yaml b/charts/opentelemetry-collector/examples/namespace-override/rendered/service.yaml deleted file mode 100644 index 78a201a16..000000000 --- a/charts/opentelemetry-collector/examples/namespace-override/rendered/service.yaml +++ /dev/null @@ -1,48 +0,0 @@ ---- -# Source: opentelemetry-collector/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: example-opentelemetry-collector - namespace: my-otel-ns - labels: - helm.sh/chart: opentelemetry-collector-0.74.1 - 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 - ports: - - - name: jaeger-compact - port: 6831 - targetPort: 6831 - protocol: UDP - - name: jaeger-grpc - port: 14250 - targetPort: 14250 - protocol: TCP - - name: jaeger-thrift - port: 14268 - targetPort: 14268 - protocol: TCP - - name: otlp - port: 4317 - targetPort: 4317 - protocol: TCP - appProtocol: grpc - - name: otlp-http - port: 4318 - targetPort: 4318 - protocol: TCP - - name: zipkin - port: 9411 - targetPort: 9411 - protocol: TCP - selector: - app.kubernetes.io/name: opentelemetry-collector - app.kubernetes.io/instance: example - component: standalone-collector - internalTrafficPolicy: Cluster diff --git a/charts/opentelemetry-collector/examples/namespace-override/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/namespace-override/rendered/serviceaccount.yaml deleted file mode 100644 index 8a571c391..000000000 --- a/charts/opentelemetry-collector/examples/namespace-override/rendered/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: opentelemetry-collector/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: example-opentelemetry-collector - namespace: my-otel-ns - labels: - helm.sh/chart: opentelemetry-collector-0.74.1 - app.kubernetes.io/name: opentelemetry-collector - app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.89.0" - app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/namespace-override/values.yaml b/charts/opentelemetry-collector/examples/namespace-override/values.yaml deleted file mode 100644 index dfcc70f7f..000000000 --- a/charts/opentelemetry-collector/examples/namespace-override/values.yaml +++ /dev/null @@ -1,6 +0,0 @@ -mode: deployment - -namespaceOverride: "my-otel-ns" - -clusterRole: - create: true