From aa8309b57cae095c7dc3f0d349c7b975f7b07b27 Mon Sep 17 00:00:00 2001 From: Alejandro Acevedo Date: Tue, 29 Oct 2024 10:08:29 +0100 Subject: [PATCH 1/4] Allow to split the image registry and the repository --- charts/opentelemetry-collector/Chart.yaml | 2 +- charts/opentelemetry-collector/templates/_helpers.tpl | 7 +++++++ charts/opentelemetry-collector/templates/_pod.tpl | 5 +++-- charts/opentelemetry-collector/values.yaml | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml index a52d9f071..e3c2fa2c0 100644 --- a/charts/opentelemetry-collector/Chart.yaml +++ b/charts/opentelemetry-collector/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-collector -version: 0.108.0 +version: 0.108.1 description: OpenTelemetry Collector Helm chart for Kubernetes type: application home: https://opentelemetry.io/ diff --git a/charts/opentelemetry-collector/templates/_helpers.tpl b/charts/opentelemetry-collector/templates/_helpers.tpl index 130bf2a7b..b41de02d1 100644 --- a/charts/opentelemetry-collector/templates/_helpers.tpl +++ b/charts/opentelemetry-collector/templates/_helpers.tpl @@ -242,3 +242,10 @@ Create ConfigMap checksum annotation if configMap.existingPath is defined, other {{- end -}} {{- end }} {{- end }} + +{{/* +Return the the image registry. +*/}} +{{- define "opentelemetry-collector.imageRegistry" -}} + {{ default .Values.image.registry (.Values.global).imageRegistry }} +{{- end }} diff --git a/charts/opentelemetry-collector/templates/_pod.tpl b/charts/opentelemetry-collector/templates/_pod.tpl index 07332ccc9..9b31e2f1f 100644 --- a/charts/opentelemetry-collector/templates/_pod.tpl +++ b/charts/opentelemetry-collector/templates/_pod.tpl @@ -33,10 +33,11 @@ containers: {{- else -}} {{- toYaml .Values.securityContext | nindent 6 }} {{- end }} + {{- $imageRegistry := include "opentelemetry-collector.imageRegistry" . -}} {{- if .Values.image.digest }} - image: "{{ ternary "" (print (.Values.global).imageRegistry "/") (empty (.Values.global).imageRegistry) }}{{ .Values.image.repository }}@{{ .Values.image.digest }}" + image: "{{ ternary "" (print $imageRegistry "/") (empty $imageRegistry) }}{{ .Values.image.repository }}@{{ .Values.image.digest }}" {{- else }} - image: "{{ ternary "" (print (.Values.global).imageRegistry "/") (empty (.Values.global).imageRegistry) }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + image: "{{ ternary "" (print $imageRegistry "/") (empty $imageRegistry) }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" {{- end }} imagePullPolicy: {{ .Values.image.pullPolicy }} diff --git a/charts/opentelemetry-collector/values.yaml b/charts/opentelemetry-collector/values.yaml index 3a0484fa9..53e9bd149 100644 --- a/charts/opentelemetry-collector/values.yaml +++ b/charts/opentelemetry-collector/values.yaml @@ -187,6 +187,7 @@ config: alternateConfig: {} image: + registry: "" # If you want to use the core image `otel/opentelemetry-collector`, you also need to change `command.name` value to `otelcol`. repository: "" pullPolicy: IfNotPresent From db21dd262104f2bac8f484bec531f9ea04932892 Mon Sep 17 00:00:00 2001 From: Alejandro Acevedo Date: Tue, 29 Oct 2024 17:31:12 +0100 Subject: [PATCH 2/4] Generate examples --- .../examples/alternate-config/rendered/clusterrole.yaml | 2 +- .../alternate-config/rendered/clusterrolebinding.yaml | 2 +- .../examples/alternate-config/rendered/configmap.yaml | 2 +- .../examples/alternate-config/rendered/deployment.yaml | 4 ++-- .../examples/alternate-config/rendered/service.yaml | 2 +- .../examples/alternate-config/rendered/serviceaccount.yaml | 2 +- .../daemonset-and-deployment/rendered/configmap-agent.yaml | 2 +- .../examples/daemonset-and-deployment/rendered/configmap.yaml | 2 +- .../examples/daemonset-and-deployment/rendered/daemonset.yaml | 4 ++-- .../daemonset-and-deployment/rendered/deployment.yaml | 4 ++-- .../examples/daemonset-and-deployment/rendered/service.yaml | 2 +- .../daemonset-and-deployment/rendered/serviceaccount.yaml | 2 +- .../daemonset-collector-logs/rendered/configmap-agent.yaml | 2 +- .../examples/daemonset-collector-logs/rendered/daemonset.yaml | 4 ++-- .../daemonset-collector-logs/rendered/serviceaccount.yaml | 2 +- .../daemonset-hostmetrics/rendered/configmap-agent.yaml | 2 +- .../examples/daemonset-hostmetrics/rendered/daemonset.yaml | 4 ++-- .../daemonset-hostmetrics/rendered/serviceaccount.yaml | 2 +- .../daemonset-lifecycle-hooks/rendered/configmap-agent.yaml | 2 +- .../daemonset-lifecycle-hooks/rendered/daemonset.yaml | 4 ++-- .../daemonset-lifecycle-hooks/rendered/serviceaccount.yaml | 2 +- .../examples/daemonset-only/rendered/configmap-agent.yaml | 2 +- .../examples/daemonset-only/rendered/daemonset.yaml | 4 ++-- .../examples/daemonset-only/rendered/serviceaccount.yaml | 2 +- .../examples/deployment-only/rendered/configmap.yaml | 2 +- .../examples/deployment-only/rendered/deployment.yaml | 4 ++-- .../examples/deployment-only/rendered/service.yaml | 2 +- .../examples/deployment-only/rendered/serviceaccount.yaml | 2 +- .../examples/deployment-otlp-traces/rendered/configmap.yaml | 2 +- .../examples/deployment-otlp-traces/rendered/deployment.yaml | 4 ++-- .../examples/deployment-otlp-traces/rendered/service.yaml | 2 +- .../deployment-otlp-traces/rendered/serviceaccount.yaml | 2 +- .../rendered/deployment.yaml | 2 +- .../deployment-use-existing-configMap/rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../examples/kubernetesAttributes/rendered/clusterrole.yaml | 2 +- .../kubernetesAttributes/rendered/clusterrolebinding.yaml | 2 +- .../examples/kubernetesAttributes/rendered/configmap.yaml | 2 +- .../examples/kubernetesAttributes/rendered/deployment.yaml | 4 ++-- .../examples/kubernetesAttributes/rendered/service.yaml | 2 +- .../kubernetesAttributes/rendered/serviceaccount.yaml | 2 +- .../statefulset-only/rendered/configmap-statefulset.yaml | 2 +- .../examples/statefulset-only/rendered/service.yaml | 2 +- .../examples/statefulset-only/rendered/serviceaccount.yaml | 2 +- .../examples/statefulset-only/rendered/statefulset.yaml | 4 ++-- .../statefulset-with-pvc/rendered/configmap-statefulset.yaml | 2 +- .../examples/statefulset-with-pvc/rendered/service.yaml | 2 +- .../statefulset-with-pvc/rendered/serviceaccount.yaml | 2 +- .../examples/statefulset-with-pvc/rendered/statefulset.yaml | 4 ++-- .../examples/using-GOMEMLIMIT/rendered/configmap.yaml | 2 +- .../examples/using-GOMEMLIMIT/rendered/deployment.yaml | 4 ++-- .../examples/using-GOMEMLIMIT/rendered/service.yaml | 2 +- .../examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml | 2 +- .../examples/using-custom-config/rendered/deployment.yaml | 2 +- .../examples/using-custom-config/rendered/service.yaml | 2 +- .../examples/using-custom-config/rendered/serviceaccount.yaml | 2 +- .../examples/using-shared-processes/rendered/configmap.yaml | 2 +- .../examples/using-shared-processes/rendered/deployment.yaml | 4 ++-- .../examples/using-shared-processes/rendered/service.yaml | 2 +- .../using-shared-processes/rendered/serviceaccount.yaml | 2 +- 60 files changed, 74 insertions(+), 74 deletions(-) diff --git a/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml b/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml index 1e78af46c..bbe86ca19 100644 --- a/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml +++ b/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml @@ -5,7 +5,7 @@ kind: ClusterRole metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml b/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml index 3f14fb344..90ff2227c 100644 --- a/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml +++ b/charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml @@ -5,7 +5,7 @@ kind: ClusterRoleBinding metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml index 41ae53796..c0d5af1bc 100644 --- a/charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml index e6a0c2333..133b5637d 100644 --- a/charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 360fc84164ca26f5a57ecb44cbcec02ca473b09fc86dba876f71c9fa3617f656 + checksum/config: 670ef036c3df15a2c94d89acad356261522f6b8d79aca1a1814685ab7b099d50 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml b/charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml index a805ec64b..754c3d02e 100644 --- a/charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml index 3fb5379c5..2bf47143b 100644 --- a/charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" 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 c606f8b56..4ed321411 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.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 c16fb5229..b7f158522 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.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 89d3d2e5e..417899a63 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: a2d0d31bd929305e52879f78f502d56ad49d9ef9396838490646e9034d2243de + checksum/config: 2acb09b7577f4169a04f8916606ef95d02e7f3826955b9d27139dd26d243d451 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 a5da929b7..77aeaff78 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: f67e5b63bd16a7b09fc73afd9b6d71dfbeeb2afc8471c0b0f005233ef45df91d + checksum/config: 866526a95c58045271a2166ea21577606719075f3673244dd4dcfdb6b6e9e6a7 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 a805ec64b..754c3d02e 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.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 3fb5379c5..2bf47143b 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.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 9b7052f65..898b5ec78 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.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 5490aa7c2..436cd3549 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 5237e54a1cdaad762876da10a5bab6f686506211aaa2c70b901a74fec8b82140 + checksum/config: a1b1b737bf79fc832bc30bfe0a0deb268c667e44c118c3b1d927eaa571dd71ed 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 3fb5379c5..2bf47143b 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.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 c6cefe667..79f080d4a 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml index 8163477be..82a508d63 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 98dea268c8a8fe987e082a4e85801387f2b60fefc281f9b1edd1080f0af62574 + checksum/config: 33c407099ba68df6e37af2360005a56a4160bab2a507ba93fc7387bd1279230f 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 3fb5379c5..2bf47143b 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.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 14ebd4179..751350184 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.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 6b09682d7..8c6835c30 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: c81f167b09355b9a9b3d7e1a4f994dfb1ef88379ded1a4b902cd4a2ace196a79 + checksum/config: fc75c8a6a0cc30ccc361d551b3e376284b21dbdb4b5747f154fe77f2d2e47af0 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 3fb5379c5..2bf47143b 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.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 14ebd4179..751350184 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml index 535b458a6..cdd6671b5 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: c81f167b09355b9a9b3d7e1a4f994dfb1ef88379ded1a4b902cd4a2ace196a79 + checksum/config: fc75c8a6a0cc30ccc361d551b3e376284b21dbdb4b5747f154fe77f2d2e47af0 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 3fb5379c5..2bf47143b 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml index c16fb5229..b7f158522 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml index 2425fd5c9..1225884fc 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: f67e5b63bd16a7b09fc73afd9b6d71dfbeeb2afc8471c0b0f005233ef45df91d + checksum/config: 866526a95c58045271a2166ea21577606719075f3673244dd4dcfdb6b6e9e6a7 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 a805ec64b..754c3d02e 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml index 3fb5379c5..2bf47143b 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.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 b2a374121..957648233 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.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 b42bda27b..18d22fca3 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 09d236d9b1f430ef0e0c20f6667eb2f1d17c9f550a8648c0bc86ecf703089397 + checksum/config: 563c7cd0e3c56680c5d26ad2d7988aae0a11a58b5d3c541472c2955217c178a7 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 38e16e6db..35797a225 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.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 3fb5379c5..2bf47143b 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.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 e28a6b3b5..56513c409 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.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 a805ec64b..754c3d02e 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.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 3fb5379c5..2bf47143b 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml index 9455c12f4..5115ef876 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml index 3f14fb344..90ff2227c 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml index 1111d1c67..93bc404a8 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml index fdaf9e983..ea59175bb 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 63dd878669e1f465c60f65786dc6091bd23f761e6332c1eb2c14dc626f85a246 + checksum/config: 2a41afa7af114627a6b7a5b8dba8b752c66f4469b2564b3087cbd1a827793e12 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 a805ec64b..754c3d02e 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml index 3fb5379c5..2bf47143b 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.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 1b9f35dcc..3e357bde3 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml index 284ee6c7d..a325ce3e0 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml index 3fb5379c5..2bf47143b 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml index e68020ef7..c5fc5654c 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - checksum/config: 1d41134c1cf3e69cb683b501ecc5e5a8ef07a5fe44edec2851e0fd923cac34a6 + checksum/config: 3bc15d1cc7b25dff1186c91aa9d345f51fd0d03464c0d6995dd73ac3c4ba2bfd labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/configmap-statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/configmap-statefulset.yaml index 1b9f35dcc..3e357bde3 100644 --- a/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/configmap-statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/configmap-statefulset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector-statefulset namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/service.yaml b/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/service.yaml index 284ee6c7d..a325ce3e0 100644 --- a/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/serviceaccount.yaml index 3fb5379c5..2bf47143b 100644 --- a/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/statefulset.yaml index 7fdd460fe..7c1437b95 100644 --- a/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-with-pvc/rendered/statefulset.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" @@ -29,7 +29,7 @@ spec: template: metadata: annotations: - checksum/config: 1d41134c1cf3e69cb683b501ecc5e5a8ef07a5fe44edec2851e0fd923cac34a6 + checksum/config: 3bc15d1cc7b25dff1186c91aa9d345f51fd0d03464c0d6995dd73ac3c4ba2bfd 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 c16fb5229..b7f158522 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml index a5da929b7..77aeaff78 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: f67e5b63bd16a7b09fc73afd9b6d71dfbeeb2afc8471c0b0f005233ef45df91d + checksum/config: 866526a95c58045271a2166ea21577606719075f3673244dd4dcfdb6b6e9e6a7 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 a805ec64b..754c3d02e 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml index 3fb5379c5..2bf47143b 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.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/using-custom-config/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/using-custom-config/rendered/deployment.yaml index 9e60935d5..0b0ad7ab5 100644 --- a/charts/opentelemetry-collector/examples/using-custom-config/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/using-custom-config/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/using-custom-config/rendered/service.yaml b/charts/opentelemetry-collector/examples/using-custom-config/rendered/service.yaml index a805ec64b..754c3d02e 100644 --- a/charts/opentelemetry-collector/examples/using-custom-config/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/using-custom-config/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/using-custom-config/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/using-custom-config/rendered/serviceaccount.yaml index 3fb5379c5..2bf47143b 100644 --- a/charts/opentelemetry-collector/examples/using-custom-config/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/using-custom-config/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/using-shared-processes/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/using-shared-processes/rendered/configmap.yaml index c16fb5229..b7f158522 100644 --- a/charts/opentelemetry-collector/examples/using-shared-processes/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/using-shared-processes/rendered/configmap.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/using-shared-processes/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/using-shared-processes/rendered/deployment.yaml index 4558f3bc9..39aedf993 100644 --- a/charts/opentelemetry-collector/examples/using-shared-processes/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/using-shared-processes/rendered/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: f67e5b63bd16a7b09fc73afd9b6d71dfbeeb2afc8471c0b0f005233ef45df91d + checksum/config: 866526a95c58045271a2166ea21577606719075f3673244dd4dcfdb6b6e9e6a7 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/using-shared-processes/rendered/service.yaml b/charts/opentelemetry-collector/examples/using-shared-processes/rendered/service.yaml index a805ec64b..754c3d02e 100644 --- a/charts/opentelemetry-collector/examples/using-shared-processes/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/using-shared-processes/rendered/service.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" diff --git a/charts/opentelemetry-collector/examples/using-shared-processes/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/using-shared-processes/rendered/serviceaccount.yaml index 3fb5379c5..2bf47143b 100644 --- a/charts/opentelemetry-collector/examples/using-shared-processes/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/using-shared-processes/rendered/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: name: example-opentelemetry-collector namespace: default labels: - helm.sh/chart: opentelemetry-collector-0.108.0 + helm.sh/chart: opentelemetry-collector-0.108.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.111.0" From 40097ca78fac0b9745abffb907de70b423a45474 Mon Sep 17 00:00:00 2001 From: Alejandro Acevedo Date: Wed, 30 Oct 2024 13:37:31 +0100 Subject: [PATCH 3/4] Add extra examples when using the image.registry and global.imageRegistry --- .../rendered/configmap.yaml | 86 +++++++++++++++ .../rendered/deployment.yaml | 100 ++++++++++++++++++ .../rendered/service.yaml | 49 +++++++++ .../rendered/serviceaccount.yaml | 13 +++ .../values.yaml | 18 ++++ .../rendered/configmap.yaml | 86 +++++++++++++++ .../rendered/deployment.yaml | 100 ++++++++++++++++++ .../rendered/service.yaml | 49 +++++++++ .../rendered/serviceaccount.yaml | 13 +++ .../deployment-image-registry/values.yaml | 15 +++ 10 files changed, 529 insertions(+) create mode 100644 charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/configmap.yaml create mode 100644 charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/deployment.yaml create mode 100644 charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/service.yaml create mode 100644 charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/serviceaccount.yaml create mode 100644 charts/opentelemetry-collector/examples/deployment-global-image-registry/values.yaml create mode 100644 charts/opentelemetry-collector/examples/deployment-image-registry/rendered/configmap.yaml create mode 100644 charts/opentelemetry-collector/examples/deployment-image-registry/rendered/deployment.yaml create mode 100644 charts/opentelemetry-collector/examples/deployment-image-registry/rendered/service.yaml create mode 100644 charts/opentelemetry-collector/examples/deployment-image-registry/rendered/serviceaccount.yaml create mode 100644 charts/opentelemetry-collector/examples/deployment-image-registry/values.yaml diff --git a/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/configmap.yaml new file mode 100644 index 000000000..b7f158522 --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/configmap.yaml @@ -0,0 +1,86 @@ +--- +# Source: opentelemetry-collector/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.108.1 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.111.0" + app.kubernetes.io/managed-by: Helm + +data: + relay: | + exporters: + debug: {} + extensions: + health_check: + endpoint: ${env:MY_POD_IP}:13133 + 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 + 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/deployment-global-image-registry/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/deployment.yaml new file mode 100644 index 000000000..50b383121 --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/deployment.yaml @@ -0,0 +1,100 @@ +--- +# Source: opentelemetry-collector/templates/deployment.yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.108.1 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.111.0" + app.kubernetes.io/managed-by: Helm + +spec: + replicas: 3 + 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: 866526a95c58045271a2166ea21577606719075f3673244dd4dcfdb6b6e9e6a7 + + 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-k8s + args: + - --config=/conf/relay.yaml + securityContext: + {} + image: "custom.io/otel/opentelemetry-collector-k8s:0.111.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 + - name: GOMEMLIMIT + value: "3276MiB" + livenessProbe: + httpGet: + path: / + port: 13133 + readinessProbe: + httpGet: + path: / + port: 13133 + resources: + limits: + cpu: 2 + memory: 4Gi + 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/deployment-global-image-registry/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/service.yaml new file mode 100644 index 000000000..754c3d02e --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/service.yaml @@ -0,0 +1,49 @@ +--- +# Source: opentelemetry-collector/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.108.1 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.111.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/deployment-global-image-registry/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/serviceaccount.yaml new file mode 100644 index 000000000..2bf47143b --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: opentelemetry-collector/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.108.1 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.111.0" + app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/deployment-global-image-registry/values.yaml b/charts/opentelemetry-collector/examples/deployment-global-image-registry/values.yaml new file mode 100644 index 000000000..b0822aac8 --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-global-image-registry/values.yaml @@ -0,0 +1,18 @@ +mode: deployment + +global: + imageRegistry: "custom.io" + +image: + registry: "quay.io" + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + +replicaCount: 3 + +resources: + limits: + cpu: 2 + memory: 4Gi diff --git a/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/configmap.yaml new file mode 100644 index 000000000..b7f158522 --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/configmap.yaml @@ -0,0 +1,86 @@ +--- +# Source: opentelemetry-collector/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.108.1 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.111.0" + app.kubernetes.io/managed-by: Helm + +data: + relay: | + exporters: + debug: {} + extensions: + health_check: + endpoint: ${env:MY_POD_IP}:13133 + 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 + 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/deployment-image-registry/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/deployment.yaml new file mode 100644 index 000000000..11d7c13ed --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/deployment.yaml @@ -0,0 +1,100 @@ +--- +# Source: opentelemetry-collector/templates/deployment.yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.108.1 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.111.0" + app.kubernetes.io/managed-by: Helm + +spec: + replicas: 3 + 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: 866526a95c58045271a2166ea21577606719075f3673244dd4dcfdb6b6e9e6a7 + + 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-k8s + args: + - --config=/conf/relay.yaml + securityContext: + {} + image: "quay.io/otel/opentelemetry-collector-k8s:0.111.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 + - name: GOMEMLIMIT + value: "3276MiB" + livenessProbe: + httpGet: + path: / + port: 13133 + readinessProbe: + httpGet: + path: / + port: 13133 + resources: + limits: + cpu: 2 + memory: 4Gi + 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/deployment-image-registry/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/service.yaml new file mode 100644 index 000000000..754c3d02e --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/service.yaml @@ -0,0 +1,49 @@ +--- +# Source: opentelemetry-collector/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.108.1 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.111.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/deployment-image-registry/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/serviceaccount.yaml new file mode 100644 index 000000000..2bf47143b --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: opentelemetry-collector/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: example-opentelemetry-collector + namespace: default + labels: + helm.sh/chart: opentelemetry-collector-0.108.1 + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: example + app.kubernetes.io/version: "0.111.0" + app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/deployment-image-registry/values.yaml b/charts/opentelemetry-collector/examples/deployment-image-registry/values.yaml new file mode 100644 index 000000000..c3654ed21 --- /dev/null +++ b/charts/opentelemetry-collector/examples/deployment-image-registry/values.yaml @@ -0,0 +1,15 @@ +mode: deployment + +image: + registry: "quay.io" + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + +replicaCount: 3 + +resources: + limits: + cpu: 2 + memory: 4Gi From e180d3363ac85c1e5c1e87f8ad198cd2e7ffa1f2 Mon Sep 17 00:00:00 2001 From: Alejandro Acevedo Date: Wed, 30 Oct 2024 18:25:07 +0100 Subject: [PATCH 4/4] Revert "Add extra examples when using the image.registry and global.imageRegistry" This reverts commit 40097ca78fac0b9745abffb907de70b423a45474. --- .../rendered/configmap.yaml | 86 --------------- .../rendered/deployment.yaml | 100 ------------------ .../rendered/service.yaml | 49 --------- .../rendered/serviceaccount.yaml | 13 --- .../values.yaml | 18 ---- .../rendered/configmap.yaml | 86 --------------- .../rendered/deployment.yaml | 100 ------------------ .../rendered/service.yaml | 49 --------- .../rendered/serviceaccount.yaml | 13 --- .../deployment-image-registry/values.yaml | 15 --- 10 files changed, 529 deletions(-) delete mode 100644 charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/configmap.yaml delete mode 100644 charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/deployment.yaml delete mode 100644 charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/service.yaml delete mode 100644 charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/serviceaccount.yaml delete mode 100644 charts/opentelemetry-collector/examples/deployment-global-image-registry/values.yaml delete mode 100644 charts/opentelemetry-collector/examples/deployment-image-registry/rendered/configmap.yaml delete mode 100644 charts/opentelemetry-collector/examples/deployment-image-registry/rendered/deployment.yaml delete mode 100644 charts/opentelemetry-collector/examples/deployment-image-registry/rendered/service.yaml delete mode 100644 charts/opentelemetry-collector/examples/deployment-image-registry/rendered/serviceaccount.yaml delete mode 100644 charts/opentelemetry-collector/examples/deployment-image-registry/values.yaml diff --git a/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/configmap.yaml deleted file mode 100644 index b7f158522..000000000 --- a/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/configmap.yaml +++ /dev/null @@ -1,86 +0,0 @@ ---- -# Source: opentelemetry-collector/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: example-opentelemetry-collector - namespace: default - labels: - helm.sh/chart: opentelemetry-collector-0.108.1 - app.kubernetes.io/name: opentelemetry-collector - app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.111.0" - app.kubernetes.io/managed-by: Helm - -data: - relay: | - exporters: - debug: {} - extensions: - health_check: - endpoint: ${env:MY_POD_IP}:13133 - 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 - 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/deployment-global-image-registry/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/deployment.yaml deleted file mode 100644 index 50b383121..000000000 --- a/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/deployment.yaml +++ /dev/null @@ -1,100 +0,0 @@ ---- -# Source: opentelemetry-collector/templates/deployment.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-opentelemetry-collector - namespace: default - labels: - helm.sh/chart: opentelemetry-collector-0.108.1 - app.kubernetes.io/name: opentelemetry-collector - app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.111.0" - app.kubernetes.io/managed-by: Helm - -spec: - replicas: 3 - 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: 866526a95c58045271a2166ea21577606719075f3673244dd4dcfdb6b6e9e6a7 - - 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-k8s - args: - - --config=/conf/relay.yaml - securityContext: - {} - image: "custom.io/otel/opentelemetry-collector-k8s:0.111.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 - - name: GOMEMLIMIT - value: "3276MiB" - livenessProbe: - httpGet: - path: / - port: 13133 - readinessProbe: - httpGet: - path: / - port: 13133 - resources: - limits: - cpu: 2 - memory: 4Gi - 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/deployment-global-image-registry/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/service.yaml deleted file mode 100644 index 754c3d02e..000000000 --- a/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/service.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -# Source: opentelemetry-collector/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: example-opentelemetry-collector - namespace: default - labels: - helm.sh/chart: opentelemetry-collector-0.108.1 - app.kubernetes.io/name: opentelemetry-collector - app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.111.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/deployment-global-image-registry/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-global-image-registry/rendered/serviceaccount.yaml deleted file mode 100644 index 2bf47143b..000000000 --- a/charts/opentelemetry-collector/examples/deployment-global-image-registry/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: default - labels: - helm.sh/chart: opentelemetry-collector-0.108.1 - app.kubernetes.io/name: opentelemetry-collector - app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.111.0" - app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/deployment-global-image-registry/values.yaml b/charts/opentelemetry-collector/examples/deployment-global-image-registry/values.yaml deleted file mode 100644 index b0822aac8..000000000 --- a/charts/opentelemetry-collector/examples/deployment-global-image-registry/values.yaml +++ /dev/null @@ -1,18 +0,0 @@ -mode: deployment - -global: - imageRegistry: "custom.io" - -image: - registry: "quay.io" - repository: "otel/opentelemetry-collector-k8s" - -command: - name: "otelcol-k8s" - -replicaCount: 3 - -resources: - limits: - cpu: 2 - memory: 4Gi diff --git a/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/configmap.yaml deleted file mode 100644 index b7f158522..000000000 --- a/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/configmap.yaml +++ /dev/null @@ -1,86 +0,0 @@ ---- -# Source: opentelemetry-collector/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: example-opentelemetry-collector - namespace: default - labels: - helm.sh/chart: opentelemetry-collector-0.108.1 - app.kubernetes.io/name: opentelemetry-collector - app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.111.0" - app.kubernetes.io/managed-by: Helm - -data: - relay: | - exporters: - debug: {} - extensions: - health_check: - endpoint: ${env:MY_POD_IP}:13133 - 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 - 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/deployment-image-registry/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/deployment.yaml deleted file mode 100644 index 11d7c13ed..000000000 --- a/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/deployment.yaml +++ /dev/null @@ -1,100 +0,0 @@ ---- -# Source: opentelemetry-collector/templates/deployment.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-opentelemetry-collector - namespace: default - labels: - helm.sh/chart: opentelemetry-collector-0.108.1 - app.kubernetes.io/name: opentelemetry-collector - app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.111.0" - app.kubernetes.io/managed-by: Helm - -spec: - replicas: 3 - 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: 866526a95c58045271a2166ea21577606719075f3673244dd4dcfdb6b6e9e6a7 - - 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-k8s - args: - - --config=/conf/relay.yaml - securityContext: - {} - image: "quay.io/otel/opentelemetry-collector-k8s:0.111.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 - - name: GOMEMLIMIT - value: "3276MiB" - livenessProbe: - httpGet: - path: / - port: 13133 - readinessProbe: - httpGet: - path: / - port: 13133 - resources: - limits: - cpu: 2 - memory: 4Gi - 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/deployment-image-registry/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/service.yaml deleted file mode 100644 index 754c3d02e..000000000 --- a/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/service.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -# Source: opentelemetry-collector/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: example-opentelemetry-collector - namespace: default - labels: - helm.sh/chart: opentelemetry-collector-0.108.1 - app.kubernetes.io/name: opentelemetry-collector - app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.111.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/deployment-image-registry/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-image-registry/rendered/serviceaccount.yaml deleted file mode 100644 index 2bf47143b..000000000 --- a/charts/opentelemetry-collector/examples/deployment-image-registry/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: default - labels: - helm.sh/chart: opentelemetry-collector-0.108.1 - app.kubernetes.io/name: opentelemetry-collector - app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.111.0" - app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-collector/examples/deployment-image-registry/values.yaml b/charts/opentelemetry-collector/examples/deployment-image-registry/values.yaml deleted file mode 100644 index c3654ed21..000000000 --- a/charts/opentelemetry-collector/examples/deployment-image-registry/values.yaml +++ /dev/null @@ -1,15 +0,0 @@ -mode: deployment - -image: - registry: "quay.io" - repository: "otel/opentelemetry-collector-k8s" - -command: - name: "otelcol-k8s" - -replicaCount: 3 - -resources: - limits: - cpu: 2 - memory: 4Gi