From 8467a3ed884a49b6484d5738ed169654eb171be6 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Fri, 19 Apr 2024 10:28:34 -0600 Subject: [PATCH] [collector] Remove default collector image (#1148) * Remove default collector image * fix command * regen examples * Remove command name restriction * Adding warning --- charts/opentelemetry-collector/Chart.yaml | 2 +- charts/opentelemetry-collector/README.md | 14 +++++------ charts/opentelemetry-collector/UPGRADING.md | 25 +++++++++++++++++++ .../ci/GOMEMLIMIT-values.yaml | 6 +++++ .../ci/clusterrole-values.yaml | 7 ++++++ .../ci/config-override-values.yaml | 7 ++++++ .../ci/daemonset-values.yaml | 7 ++++++ .../ci/deployment-values.yaml | 7 ++++++ .../ci/disabling-protocols-values.yaml | 7 ++++++ .../ci/hpa-deployment-values.yaml | 6 +++++ .../ci/hpa-statefulset-values.yaml | 6 +++++ .../ci/multiple-ingress-values.yaml | 6 +++++ .../ci/networkpolicy-override-values.yaml | 7 ++++++ .../ci/networkpolicy-values.yaml | 7 ++++++ .../ci/preset-clustermetrics-values.yaml | 6 +++++ .../ci/preset-hostmetrics-values.yaml | 6 +++++ .../ci/preset-k8sevents-values.yaml | 6 +++++ .../ci/preset-kubeletmetrics-values.yaml | 6 +++++ .../preset-kubernetesattributes-values.yaml | 6 +++++ .../ci/preset-logscollection-values.yaml | 6 +++++ .../ci/probes-values.yaml | 6 +++++ .../ci/statefulset-values.yaml | 7 ++++++ .../daemonset-values.yaml | 6 +++++ .../deployment-values.yaml | 6 +++++ .../rendered/configmap-agent.yaml | 2 +- .../rendered/configmap.yaml | 2 +- .../rendered/daemonset.yaml | 8 +++--- .../rendered/deployment.yaml | 8 +++--- .../rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/configmap-agent.yaml | 2 +- .../rendered/daemonset.yaml | 8 +++--- .../rendered/serviceaccount.yaml | 2 +- .../daemonset-collector-logs/values.yaml | 6 +++++ .../rendered/configmap-agent.yaml | 2 +- .../rendered/daemonset.yaml | 8 +++--- .../rendered/serviceaccount.yaml | 2 +- .../daemonset-hostmetrics/values.yaml | 6 +++++ .../rendered/configmap-agent.yaml | 2 +- .../rendered/daemonset.yaml | 8 +++--- .../rendered/serviceaccount.yaml | 2 +- .../daemonset-lifecycle-hooks/values.yaml | 7 ++++++ .../rendered/configmap-agent.yaml | 2 +- .../daemonset-only/rendered/daemonset.yaml | 8 +++--- .../rendered/serviceaccount.yaml | 2 +- .../examples/daemonset-only/values.yaml | 5 ++++ .../deployment-only/rendered/configmap.yaml | 2 +- .../deployment-only/rendered/deployment.yaml | 8 +++--- .../deployment-only/rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../examples/deployment-only/values.yaml | 7 +++++- .../rendered/configmap.yaml | 2 +- .../rendered/deployment.yaml | 8 +++--- .../rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../deployment-otlp-traces/values.yaml | 7 +++++- .../deployment-values.yaml | 6 +++-- .../rendered/deployment.yaml | 6 ++--- .../rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/clusterrole.yaml | 2 +- .../rendered/clusterrolebinding.yaml | 2 +- .../rendered/configmap.yaml | 2 +- .../rendered/deployment.yaml | 8 +++--- .../rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../examples/kubernetesAttributes/values.yaml | 6 +++++ .../rendered/configmap-statefulset.yaml | 2 +- .../statefulset-only/rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/statefulset.yaml | 8 +++--- .../examples/statefulset-only/values.yaml | 6 +++++ .../rendered/configmap-statefulset.yaml | 2 +- .../rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../rendered/statefulset.yaml | 8 +++--- .../examples/statefulset-with-pvc/values.yaml | 6 +++++ .../using-GOMEMLIMIT/rendered/configmap.yaml | 2 +- .../using-GOMEMLIMIT/rendered/deployment.yaml | 8 +++--- .../using-GOMEMLIMIT/rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../examples/using-GOMEMLIMIT/values.yaml | 7 ++++++ .../templates/NOTES.txt | 4 +++ charts/opentelemetry-collector/values.yaml | 2 +- 84 files changed, 334 insertions(+), 86 deletions(-) diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml index 6bf8b73cfd6..fd103d4813f 100644 --- a/charts/opentelemetry-collector/Chart.yaml +++ b/charts/opentelemetry-collector/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-collector -version: 0.88.0 +version: 0.89.0 description: OpenTelemetry Collector Helm chart for Kubernetes type: application home: https://opentelemetry.io/ diff --git a/charts/opentelemetry-collector/README.md b/charts/opentelemetry-collector/README.md index e47d8717085..a085a8872ef 100644 --- a/charts/opentelemetry-collector/README.md +++ b/charts/opentelemetry-collector/README.md @@ -19,7 +19,7 @@ helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm To install the chart with the release name my-opentelemetry-collector, run the following command: ```console -helm install my-opentelemetry-collector open-telemetry/opentelemetry-collector --set mode= +helm install my-opentelemetry-collector open-telemetry/opentelemetry-collector --set mode= --set image.repository="otel/opentelemetry-collector-k8s" --set command.name="otelcol-k8s" ``` Where the `mode` value needs to be set to one of `daemonset`, `deployment` or `statefulset`. @@ -87,7 +87,7 @@ The collector can be used to collect logs sent to standard output by Kubernetes This feature is disabled by default. It has the following requirements: - It needs agent collector to be deployed. -- It requires the [Filelog receiver](https://opentelemetry.io/docs/kubernetes/collector/components/#filelog-receiver) to be included in the collector, such as [contrib](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib) version of the collector image. +- It requires the [Filelog receiver](https://opentelemetry.io/docs/kubernetes/collector/components/#filelog-receiver) to be included in the collector, such as [k8s](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s) version of the collector image. To enable this feature, set the `presets.logsCollection.enabled` property to `true`. Here is an example `values.yaml`: @@ -147,7 +147,7 @@ The collector can be configured to add Kubernetes metadata, such as pod name and This feature is disabled by default. It has the following requirements: -- It requires the [Kubernetes Attributes processor](https://opentelemetry.io/docs/kubernetes/collector/components/#kubernetes-attributes-processor) to be included in the collector, such as [contrib](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib) version of the collector image. +- It requires the [Kubernetes Attributes processor](https://opentelemetry.io/docs/kubernetes/collector/components/#kubernetes-attributes-processor) to be included in the collector, such as [k8s](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s) version of the collector image. To enable this feature, set the `presets.kubernetesAttributes.enabled` property to `true`. Here is an example `values.yaml`: @@ -169,7 +169,7 @@ The collector can be configured to collect node, pod, and container metrics from This feature is disabled by default. It has the following requirements: -- It requires the [Kubeletstats receiver](https://opentelemetry.io/docs/kubernetes/collector/components/#kubeletstats-receiver) to be included in the collector, such as [contrib](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib) version of the collector image. +- It requires the [Kubeletstats receiver](https://opentelemetry.io/docs/kubernetes/collector/components/#kubeletstats-receiver) to be included in the collector, such as [k8s](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s) version of the collector image. To enable this feature, set the `presets.kubeletMetrics.enabled` property to `true`. Here is an example `values.yaml`: @@ -187,7 +187,7 @@ The collector can be configured to collects cluster-level metrics from the Kuber This feature is disabled by default. It has the following requirements: -- It requires the [Kubernetes Cluster receiver](https://opentelemetry.io/docs/kubernetes/collector/components/#kubernetes-cluster-receiver) to be included in the collector, such as [contrib](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib) version of the collector image. +- It requires the [Kubernetes Cluster receiver](https://opentelemetry.io/docs/kubernetes/collector/components/#kubernetes-cluster-receiver) to be included in the collector, such as [k8s](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s) version of the collector image. - It requires statefulset or deployment mode with a single replica. To enable this feature, set the `presets.clusterMetrics.enabled` property to `true`. @@ -208,7 +208,7 @@ The collector can be configured to collect Kubernetes events. This feature is disabled by default. It has the following requirements: -- It requires [Kubernetes Objects receiver](https://opentelemetry.io/docs/kubernetes/collector/components/#kubernetes-objects-receiver) to be included in the collector, such as [contrib](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib) version of the collector image. +- It requires [Kubernetes Objects receiver](https://opentelemetry.io/docs/kubernetes/collector/components/#kubernetes-objects-receiver) to be included in the collector, such as [k8s](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s) version of the collector image. To enable this feature, set the `presets.kubernetesEvents.enabled` property to `true`. Here is an example `values.yaml`: @@ -227,7 +227,7 @@ The collector can be configured to collect host metrics for Kubernetes nodes. This feature is disabled by default. It has the following requirements: -- It requires [Host Metrics receiver](https://opentelemetry.io/docs/kubernetes/collector/components/#host-metrics-receiver) to be included in the collector, such as [contrib](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib) version of the collector image. +- It requires [Host Metrics receiver](https://opentelemetry.io/docs/kubernetes/collector/components/#host-metrics-receiver) to be included in the collector, such as [k8s](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s) version of the collector image. To enable this feature, set the `presets.hostMetrics.enabled` property to `true`. Here is an example `values.yaml`: diff --git a/charts/opentelemetry-collector/UPGRADING.md b/charts/opentelemetry-collector/UPGRADING.md index baf65b80eed..92ac2bea55d 100644 --- a/charts/opentelemetry-collector/UPGRADING.md +++ b/charts/opentelemetry-collector/UPGRADING.md @@ -16,6 +16,31 @@ created but the Memory Ballast Extension will still be removed. Depending on the progress made in [Issue 891](https://github.com/open-telemetry/opentelemetry-helm-charts/issues/891), the use of `GOMEMLIMIT` may completely replace the Memory Ballast Extension in the future. +## 0.88.0 to 0.89.0 + +> [!WARNING] +> Critical content demanding immediate user attention due to potential risks. + +As part of working towards using the [OpenTelemetry Collector Kubernetes Distro](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s) by default, the chart now requires users to explicitly set an image repository. If you are already explicitly setting an image repository this breaking change does not affect you. + +If you are using a OpenTelemetry Community distribution of the Collector we recommend you use `otel/opentelemetry-collector-k8s`, but carefully review the [components included in this distribution](https://github.com/open-telemetry/opentelemetry-collector-releases/blob/main/distributions/otelcol-k8s/manifest.yaml) to make sure it includes all the components you use in your configuration. In the future this distribution will become the default image used for the chart. + +You can use the OpenTelemetry Collector Kubernetes Distro by adding these lines to your values.yaml: + +```yaml +image: + repository: "otel/opentelemetry-collector-k8s" +``` + +If you want to stick with using the Contrib distribution, add these lines to your values.yaml: + +```yaml +image: + repository: "otel/opentelemetry-collector-contrib" +``` + +For more details see [#1135](https://github.com/open-telemetry/opentelemetry-helm-charts/issues/1135). + ## 0.84.0 to 0.85.0 The `loggingexporter` has been removed from the default configuration. Use the `debugexporter` instead. diff --git a/charts/opentelemetry-collector/ci/GOMEMLIMIT-values.yaml b/charts/opentelemetry-collector/ci/GOMEMLIMIT-values.yaml index 6622d50eb36..cc0570fe62a 100644 --- a/charts/opentelemetry-collector/ci/GOMEMLIMIT-values.yaml +++ b/charts/opentelemetry-collector/ci/GOMEMLIMIT-values.yaml @@ -1,3 +1,9 @@ mode: deployment +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + useGOMEMLIMIT: true diff --git a/charts/opentelemetry-collector/ci/clusterrole-values.yaml b/charts/opentelemetry-collector/ci/clusterrole-values.yaml index ac39cc68b04..01acd446295 100644 --- a/charts/opentelemetry-collector/ci/clusterrole-values.yaml +++ b/charts/opentelemetry-collector/ci/clusterrole-values.yaml @@ -1,4 +1,11 @@ mode: daemonset + +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + clusterRole: create: true name: "testing-clusterrole" diff --git a/charts/opentelemetry-collector/ci/config-override-values.yaml b/charts/opentelemetry-collector/ci/config-override-values.yaml index ff0edfdb0d2..577cf4d2900 100644 --- a/charts/opentelemetry-collector/ci/config-override-values.yaml +++ b/charts/opentelemetry-collector/ci/config-override-values.yaml @@ -1,4 +1,11 @@ mode: daemonset + +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + config: receivers: jaeger: null diff --git a/charts/opentelemetry-collector/ci/daemonset-values.yaml b/charts/opentelemetry-collector/ci/daemonset-values.yaml index 1ccac8b84ad..0f1d6190551 100644 --- a/charts/opentelemetry-collector/ci/daemonset-values.yaml +++ b/charts/opentelemetry-collector/ci/daemonset-values.yaml @@ -1,4 +1,11 @@ mode: daemonset + +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + resources: limits: cpu: 100m diff --git a/charts/opentelemetry-collector/ci/deployment-values.yaml b/charts/opentelemetry-collector/ci/deployment-values.yaml index 27f3eec49ce..447a3f13578 100644 --- a/charts/opentelemetry-collector/ci/deployment-values.yaml +++ b/charts/opentelemetry-collector/ci/deployment-values.yaml @@ -2,6 +2,13 @@ global: test: templated-value mode: deployment + +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + resources: limits: cpu: 100m diff --git a/charts/opentelemetry-collector/ci/disabling-protocols-values.yaml b/charts/opentelemetry-collector/ci/disabling-protocols-values.yaml index 62cbb306754..b7a67bdfd71 100644 --- a/charts/opentelemetry-collector/ci/disabling-protocols-values.yaml +++ b/charts/opentelemetry-collector/ci/disabling-protocols-values.yaml @@ -1,4 +1,11 @@ mode: deployment + +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + ports: jaeger-compact: enabled: false diff --git a/charts/opentelemetry-collector/ci/hpa-deployment-values.yaml b/charts/opentelemetry-collector/ci/hpa-deployment-values.yaml index a53a0f56025..3fe38538066 100644 --- a/charts/opentelemetry-collector/ci/hpa-deployment-values.yaml +++ b/charts/opentelemetry-collector/ci/hpa-deployment-values.yaml @@ -1,5 +1,11 @@ mode: deployment +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + autoscaling: enabled: true minReplicas: 1 diff --git a/charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml b/charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml index fa12445692c..cbf3c605e55 100644 --- a/charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml +++ b/charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml @@ -1,5 +1,11 @@ mode: statefulset +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + autoscaling: enabled: true minReplicas: 1 diff --git a/charts/opentelemetry-collector/ci/multiple-ingress-values.yaml b/charts/opentelemetry-collector/ci/multiple-ingress-values.yaml index 1972b45d0fd..4b9df7522c5 100644 --- a/charts/opentelemetry-collector/ci/multiple-ingress-values.yaml +++ b/charts/opentelemetry-collector/ci/multiple-ingress-values.yaml @@ -1,5 +1,11 @@ mode: deployment +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + resources: limits: cpu: 100m diff --git a/charts/opentelemetry-collector/ci/networkpolicy-override-values.yaml b/charts/opentelemetry-collector/ci/networkpolicy-override-values.yaml index cc48e7fdb72..d08d368c43a 100644 --- a/charts/opentelemetry-collector/ci/networkpolicy-override-values.yaml +++ b/charts/opentelemetry-collector/ci/networkpolicy-override-values.yaml @@ -1,4 +1,11 @@ mode: daemonset + +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + resources: limits: cpu: 100m diff --git a/charts/opentelemetry-collector/ci/networkpolicy-values.yaml b/charts/opentelemetry-collector/ci/networkpolicy-values.yaml index 413c76bc6f7..7e80cb475ad 100644 --- a/charts/opentelemetry-collector/ci/networkpolicy-values.yaml +++ b/charts/opentelemetry-collector/ci/networkpolicy-values.yaml @@ -1,4 +1,11 @@ mode: deployment + +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + resources: limits: cpu: 100m diff --git a/charts/opentelemetry-collector/ci/preset-clustermetrics-values.yaml b/charts/opentelemetry-collector/ci/preset-clustermetrics-values.yaml index 503e8322228..8c21aeb37d1 100644 --- a/charts/opentelemetry-collector/ci/preset-clustermetrics-values.yaml +++ b/charts/opentelemetry-collector/ci/preset-clustermetrics-values.yaml @@ -1,5 +1,11 @@ mode: deployment +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + presets: clusterMetrics: enabled: true diff --git a/charts/opentelemetry-collector/ci/preset-hostmetrics-values.yaml b/charts/opentelemetry-collector/ci/preset-hostmetrics-values.yaml index 62567e4af1e..4889c0142b1 100644 --- a/charts/opentelemetry-collector/ci/preset-hostmetrics-values.yaml +++ b/charts/opentelemetry-collector/ci/preset-hostmetrics-values.yaml @@ -1,5 +1,11 @@ mode: daemonset +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + presets: hostMetrics: enabled: true diff --git a/charts/opentelemetry-collector/ci/preset-k8sevents-values.yaml b/charts/opentelemetry-collector/ci/preset-k8sevents-values.yaml index b9e5c14bea9..65782919036 100644 --- a/charts/opentelemetry-collector/ci/preset-k8sevents-values.yaml +++ b/charts/opentelemetry-collector/ci/preset-k8sevents-values.yaml @@ -1,5 +1,11 @@ mode: deployment +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + presets: kubernetesEvents: enabled: true diff --git a/charts/opentelemetry-collector/ci/preset-kubeletmetrics-values.yaml b/charts/opentelemetry-collector/ci/preset-kubeletmetrics-values.yaml index 8c97ffc2a15..83dd9cab423 100644 --- a/charts/opentelemetry-collector/ci/preset-kubeletmetrics-values.yaml +++ b/charts/opentelemetry-collector/ci/preset-kubeletmetrics-values.yaml @@ -1,5 +1,11 @@ mode: daemonset +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + presets: kubeletMetrics: enabled: true diff --git a/charts/opentelemetry-collector/ci/preset-kubernetesattributes-values.yaml b/charts/opentelemetry-collector/ci/preset-kubernetesattributes-values.yaml index 4f895c97a5a..ef32ac98e33 100644 --- a/charts/opentelemetry-collector/ci/preset-kubernetesattributes-values.yaml +++ b/charts/opentelemetry-collector/ci/preset-kubernetesattributes-values.yaml @@ -1,5 +1,11 @@ mode: daemonset +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + presets: kubernetesAttributes: enabled: true diff --git a/charts/opentelemetry-collector/ci/preset-logscollection-values.yaml b/charts/opentelemetry-collector/ci/preset-logscollection-values.yaml index 737b291c7b4..1dd9a8e575a 100644 --- a/charts/opentelemetry-collector/ci/preset-logscollection-values.yaml +++ b/charts/opentelemetry-collector/ci/preset-logscollection-values.yaml @@ -1,5 +1,11 @@ mode: daemonset +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + presets: logsCollection: enabled: true diff --git a/charts/opentelemetry-collector/ci/probes-values.yaml b/charts/opentelemetry-collector/ci/probes-values.yaml index 330031e618f..831f9ef6726 100644 --- a/charts/opentelemetry-collector/ci/probes-values.yaml +++ b/charts/opentelemetry-collector/ci/probes-values.yaml @@ -1,5 +1,11 @@ mode: daemonset +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + livenessProbe: initialDelaySeconds: 10 periodSeconds: 5 diff --git a/charts/opentelemetry-collector/ci/statefulset-values.yaml b/charts/opentelemetry-collector/ci/statefulset-values.yaml index f4b29421fe8..76de30c7131 100644 --- a/charts/opentelemetry-collector/ci/statefulset-values.yaml +++ b/charts/opentelemetry-collector/ci/statefulset-values.yaml @@ -1,4 +1,11 @@ mode: statefulset + +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + replicaCount: 2 resources: limits: diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/daemonset-values.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/daemonset-values.yaml index 9ca59083146..5b21b7bbe31 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/daemonset-values.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/daemonset-values.yaml @@ -1,5 +1,11 @@ mode: daemonset +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + config: exporters: otlp: diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/deployment-values.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/deployment-values.yaml index 4618a2eca39..1c80d158029 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/deployment-values.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/deployment-values.yaml @@ -1,5 +1,11 @@ mode: deployment +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + resources: limits: cpu: 100m 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 4ef9cca4f90..5175e38fede 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.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 034809def56..1aca7d43414 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.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 7dbfc9761a5..8bbf74a4ce1 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: bde82c78c86cabb52054616aad3ddd51ae219792cad1db41d2e076b91025ee1f + checksum/config: cd4cb4ca2e3d10ca4c6a62d9eef61011b347a26e699f3dbbbbde0ab3e6213eb9 labels: app.kubernetes.io/name: opentelemetry-collector @@ -37,11 +37,13 @@ spec: {} containers: - name: opentelemetry-collector + command: + - /otelcol-k8s args: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.98.0" + image: "otel/opentelemetry-collector-k8s:0.98.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml index e7f3ee00129..0b193c070fd 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: d465966211f5d40b1de80fd54b55ff4423de9baf8429f50fb204d4820d3f84a5 + checksum/config: 06687cf66ee97a4d39b6e3d9eab665cb683ecd7d620beff4e0c81936ae7a0a69 labels: app.kubernetes.io/name: opentelemetry-collector @@ -39,11 +39,13 @@ spec: {} containers: - name: opentelemetry-collector + command: + - /otelcol-k8s args: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.98.0" + image: "otel/opentelemetry-collector-k8s:0.98.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml index d5fc0db2038..e6a80bbbed9 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.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 8bb6a7bc922..aa1c845def1 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.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 9a881129af9..a7fb2c9eaa6 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.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 73108c7759a..4accf687d5d 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 10d0625a1b7897184e142c64c95c160ccbec6a4f8e33ecf6efa171c3670e893b + checksum/config: 0f752d5e78191331b7702c0e006f1ebd42e1ac4a980da42a0b9423670f04cdf8 labels: app.kubernetes.io/name: opentelemetry-collector @@ -37,11 +37,13 @@ spec: {} containers: - name: opentelemetry-collector + command: + - /otelcol-k8s args: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.98.0" + image: "otel/opentelemetry-collector-k8s:0.98.0" imagePullPolicy: IfNotPresent ports: 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 8bb6a7bc922..aa1c845def1 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-collector-logs/values.yaml b/charts/opentelemetry-collector/examples/daemonset-collector-logs/values.yaml index fec8e7a1ec2..085361edad7 100644 --- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/values.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-collector-logs/values.yaml @@ -1,5 +1,11 @@ mode: daemonset +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + presets: logsCollection: enabled: true 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 574a6683764..5834db42378 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml index f511f9f4091..ac75155f81d 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: b245a788d8e170321480c6d31dbd3b3c5b7880aa0082bb106b7de7b6c8e984e4 + checksum/config: 73e8bc960a478185e31f860fa700e89961022e1fb52a20eb564b2f5d66c8fbce labels: app.kubernetes.io/name: opentelemetry-collector @@ -37,11 +37,13 @@ spec: {} containers: - name: opentelemetry-collector + command: + - /otelcol-k8s args: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.98.0" + image: "otel/opentelemetry-collector-k8s:0.98.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml index 8bb6a7bc922..aa1c845def1 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/values.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/values.yaml index 1784102304f..10dd2576f90 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/values.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/values.yaml @@ -1,5 +1,11 @@ mode: daemonset +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + presets: hostMetrics: enabled: true 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 19f038b88bc..c976a1a1820 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.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 d486dc6a5fe..68c1e1de655 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 342f32b881a6470dfdf6016c8405a9768570f202f011afa9dda8c27137ab14fb + checksum/config: 81408ffee4335726dc3922c5e2c13c5d8bc5054b28e43810636ee14cfb9ae977 labels: app.kubernetes.io/name: opentelemetry-collector @@ -37,11 +37,13 @@ spec: {} containers: - name: opentelemetry-collector + command: + - /otelcol-k8s args: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.98.0" + image: "otel/opentelemetry-collector-k8s:0.98.0" imagePullPolicy: IfNotPresent ports: 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 8bb6a7bc922..aa1c845def1 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/values.yaml b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/values.yaml index 432bbb2d882..58acddacb80 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/values.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/values.yaml @@ -1,4 +1,11 @@ mode: daemonset + +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + global: image: busybox:latest initContainers: 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 19f038b88bc..c976a1a1820 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml index f8cbc2501c8..b327342c1e9 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 342f32b881a6470dfdf6016c8405a9768570f202f011afa9dda8c27137ab14fb + checksum/config: 81408ffee4335726dc3922c5e2c13c5d8bc5054b28e43810636ee14cfb9ae977 labels: app.kubernetes.io/name: opentelemetry-collector @@ -37,11 +37,13 @@ spec: {} containers: - name: opentelemetry-collector + command: + - /otelcol-k8s args: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.98.0" + image: "otel/opentelemetry-collector-k8s:0.98.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml index 8bb6a7bc922..aa1c845def1 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/daemonset-only/values.yaml b/charts/opentelemetry-collector/examples/daemonset-only/values.yaml index e1160324560..71002cc6495 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/values.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/values.yaml @@ -1,2 +1,7 @@ mode: daemonset +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml index 034809def56..1aca7d43414 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml index 0dc117bdc05..ab30069dd02 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: d465966211f5d40b1de80fd54b55ff4423de9baf8429f50fb204d4820d3f84a5 + checksum/config: 06687cf66ee97a4d39b6e3d9eab665cb683ecd7d620beff4e0c81936ae7a0a69 labels: app.kubernetes.io/name: opentelemetry-collector @@ -39,11 +39,13 @@ spec: {} containers: - name: opentelemetry-collector + command: + - /otelcol-k8s args: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.98.0" + image: "otel/opentelemetry-collector-k8s:0.98.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml index d5fc0db2038..e6a80bbbed9 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml index 8bb6a7bc922..aa1c845def1 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/values.yaml b/charts/opentelemetry-collector/examples/deployment-only/values.yaml index 50e8a8b82e1..918205138f6 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/values.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/values.yaml @@ -1,9 +1,14 @@ mode: deployment +image: + 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-otlp-traces/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml index 0feae5608c7..816c6e6007f 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.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 30fbc6dab2d..d8df21eb6a5 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 32f6000f32baa8d955a6c9a288f80d5e6784db9fb0f174ced879bd5b9dbf3677 + checksum/config: 5053a6e01b582242d632fcddde96c38a0e34a990c8286fbce3dd0f36c7105a2c labels: app.kubernetes.io/name: opentelemetry-collector @@ -39,11 +39,13 @@ spec: {} containers: - name: opentelemetry-collector + command: + - /otelcol-k8s args: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.98.0" + image: "otel/opentelemetry-collector-k8s:0.98.0" imagePullPolicy: IfNotPresent ports: 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 ec51635a40e..add92a1a064 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.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 8bb6a7bc922..aa1c845def1 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/values.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/values.yaml index 7212994d11e..3297147ae3d 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/values.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/values.yaml @@ -1,5 +1,11 @@ mode: deployment +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + ports: jaeger-compact: enabled: false @@ -22,4 +28,3 @@ config: - otlp metrics: null logs: null - diff --git a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/deployment-values.yaml b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/deployment-values.yaml index 726b7caa935..098843d530c 100644 --- a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/deployment-values.yaml +++ b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/deployment-values.yaml @@ -8,8 +8,11 @@ resources: configMap: create: false +image: + repository: "otel/opentelemetry-collector-k8s" + command: - name: otelcol-contrib + name: "otelcol-k8s" extraArgs: ["--config=/conf/config.yaml"] extraVolumes: @@ -23,4 +26,3 @@ extraVolumes: extraVolumeMounts: - name: custom-otelcol-configmap mountPath: /conf/config.yaml - 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 65c2923bbd6..acbe378d8ef 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" @@ -40,12 +40,12 @@ spec: containers: - name: opentelemetry-collector command: - - /otelcol-contrib + - /otelcol-k8s args: - --config=/conf/config.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.98.0" + image: "otel/opentelemetry-collector-k8s:0.98.0" imagePullPolicy: IfNotPresent ports: 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 d5fc0db2038..e6a80bbbed9 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.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 8bb6a7bc922..aa1c845def1 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml index 1ea0c394f60..44fc069be14 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml index 8631d270704..747cdf7e8af 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml index 76fa13ee102..0bfdc948eda 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml index ef26ab7ae22..d2b24aaf416 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: 939e12e4acd9aaa3f102c946805916f8831177a891d73f3c985a0159a8767056 + checksum/config: 6866e1d9b22f1c8413ae475293a0d32953428323b00a255fffa181d3d0756d3d labels: app.kubernetes.io/name: opentelemetry-collector @@ -39,11 +39,13 @@ spec: {} containers: - name: opentelemetry-collector + command: + - /otelcol-k8s args: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.98.0" + image: "otel/opentelemetry-collector-k8s:0.98.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml index d5fc0db2038..e6a80bbbed9 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/serviceaccount.yaml index 8bb6a7bc922..aa1c845def1 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/values.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/values.yaml index 0a84d08c6c7..666a1eeba0a 100644 --- a/charts/opentelemetry-collector/examples/kubernetesAttributes/values.yaml +++ b/charts/opentelemetry-collector/examples/kubernetesAttributes/values.yaml @@ -1,5 +1,11 @@ mode: deployment +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + presets: kubernetesAttributes: enabled: 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 afd03c53b28..6f4c5f6e8f0 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml index 06a73745db6..9c8520c6763 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml index 8bb6a7bc922..aa1c845def1 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml index ee13bd871f1..41a9a8e58c2 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - checksum/config: d4902ad7f87ce20a553fd4674f0ef28dfe7cc1141ef6dbaae41ec9e3b8140da2 + checksum/config: 2235cb7802bf473ef7c02117a2b41adb992536a39b3087be16d7756d8a6079a8 labels: app.kubernetes.io/name: opentelemetry-collector @@ -40,11 +40,13 @@ spec: {} containers: - name: opentelemetry-collector + command: + - /otelcol-k8s args: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.98.0" + image: "otel/opentelemetry-collector-k8s:0.98.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/statefulset-only/values.yaml b/charts/opentelemetry-collector/examples/statefulset-only/values.yaml index 2f36b0e87f9..c1e9dba5c7f 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/values.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/values.yaml @@ -1,5 +1,11 @@ mode: statefulset +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + replicaCount: 2 resources: 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 afd03c53b28..6f4c5f6e8f0 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.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 06a73745db6..9c8520c6763 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.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 8bb6a7bc922..aa1c845def1 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.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 6a238f2fab3..31dc81db3a1 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" @@ -29,7 +29,7 @@ spec: template: metadata: annotations: - checksum/config: d4902ad7f87ce20a553fd4674f0ef28dfe7cc1141ef6dbaae41ec9e3b8140da2 + checksum/config: 2235cb7802bf473ef7c02117a2b41adb992536a39b3087be16d7756d8a6079a8 labels: app.kubernetes.io/name: opentelemetry-collector @@ -43,11 +43,13 @@ spec: {} containers: - name: opentelemetry-collector + command: + - /otelcol-k8s args: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.98.0" + image: "otel/opentelemetry-collector-k8s:0.98.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/statefulset-with-pvc/values.yaml b/charts/opentelemetry-collector/examples/statefulset-with-pvc/values.yaml index ef9dd53ec38..269e20a8190 100644 --- a/charts/opentelemetry-collector/examples/statefulset-with-pvc/values.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-with-pvc/values.yaml @@ -1,5 +1,11 @@ mode: statefulset +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + replicaCount: 2 resources: diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml index 034809def56..1aca7d43414 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/deployment.yaml index e7f3ee00129..0b193c070fd 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" @@ -25,7 +25,7 @@ spec: template: metadata: annotations: - checksum/config: d465966211f5d40b1de80fd54b55ff4423de9baf8429f50fb204d4820d3f84a5 + checksum/config: 06687cf66ee97a4d39b6e3d9eab665cb683ecd7d620beff4e0c81936ae7a0a69 labels: app.kubernetes.io/name: opentelemetry-collector @@ -39,11 +39,13 @@ spec: {} containers: - name: opentelemetry-collector + command: + - /otelcol-k8s args: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.98.0" + image: "otel/opentelemetry-collector-k8s:0.98.0" imagePullPolicy: IfNotPresent ports: diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/service.yaml index d5fc0db2038..e6a80bbbed9 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/serviceaccount.yaml index 8bb6a7bc922..aa1c845def1 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.88.0 + helm.sh/chart: opentelemetry-collector-0.89.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.98.0" diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/values.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/values.yaml index 61b4acc2613..7a29aad5a27 100644 --- a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/values.yaml +++ b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/values.yaml @@ -1,4 +1,11 @@ mode: deployment + +image: + repository: "otel/opentelemetry-collector-k8s" + +command: + name: "otelcol-k8s" + resources: limits: cpu: 100m diff --git a/charts/opentelemetry-collector/templates/NOTES.txt b/charts/opentelemetry-collector/templates/NOTES.txt index 84dcdf672e6..3037472ceba 100644 --- a/charts/opentelemetry-collector/templates/NOTES.txt +++ b/charts/opentelemetry-collector/templates/NOTES.txt @@ -1,3 +1,7 @@ +{{- if not .Values.image.repository }} +{{ fail "[ERROR] 'image.repository' must be set. See https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/charts/opentelemetry-collector/UPGRADING.md for instructions." }} +{{ end }} + {{- if and (not (eq .Values.mode "daemonset")) (not (eq .Values.mode "deployment")) (not (eq .Values.mode "statefulset")) }} {{ fail "[ERROR] 'mode' must be set. See https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/charts/opentelemetry-collector/UPGRADING.md for instructions." }} {{ end }} diff --git a/charts/opentelemetry-collector/values.yaml b/charts/opentelemetry-collector/values.yaml index 69e4406139f..29c6ac7a019 100644 --- a/charts/opentelemetry-collector/values.yaml +++ b/charts/opentelemetry-collector/values.yaml @@ -161,7 +161,7 @@ config: image: # If you want to use the core image `otel/opentelemetry-collector`, you also need to change `command.name` value to `otelcol`. - repository: otel/opentelemetry-collector-contrib + repository: "" pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: ""