diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml index ec008432e..be3cd990e 100644 --- a/charts/opentelemetry-collector/Chart.yaml +++ b/charts/opentelemetry-collector/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-collector -version: 0.46.0 +version: 0.47.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 cf3f00874..a15197fde 100644 --- a/charts/opentelemetry-collector/README.md +++ b/charts/opentelemetry-collector/README.md @@ -28,10 +28,9 @@ See [UPGRADING.md](UPGRADING.md). ## Security Considerations -OpenTelemetry Collector recommends to bind receivers' servers to addresses that limit connections to authorized users. This is typically not needed in containerized environments, although the Open Telemetry Collector logs the following: -``` -Using the 0.0.0.0 address exposes this server to every network interface, which may facilitate Denial of Service attacks -``` +OpenTelemetry Collector recommends to bind receivers' servers to addresses that limit connections to authorized users. +For this reason, by default the chart binds all the Collector's endpoints to the pod's IP. + More info is available in the [Security Best Practices docummentation](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/security-best-practices.md#safeguards-against-denial-of-service-attacks) Some care must be taken when using `hostNetwork: true`, as then OpenTelemetry Collector will listen on all the addresses in the host network namespace. diff --git a/charts/opentelemetry-collector/UPGRADING.md b/charts/opentelemetry-collector/UPGRADING.md index b53aa15ab..e9e39a3d4 100644 --- a/charts/opentelemetry-collector/UPGRADING.md +++ b/charts/opentelemetry-collector/UPGRADING.md @@ -1,5 +1,16 @@ # Upgrade guidelines +## 0.46.0 to 0.47.0 + +[Update Collector Endpoints to use Pod IP Instead of 0.0.0.0](https://github.com/open-telemetry/opentelemetry-helm-charts/pull/603) + +The [Collector's security guidelines were updated](https://github.com/open-telemetry/opentelemetry-collector/pull/6959) to include containerized environments when discussing safeguards against denial of service attacks. +To be in compliance with the Collector's security best practices the chart has been updated to use the Collector's pod IP in place of `0.0.0.0`. + +The chart will continue to allow complete configuration of the Collector via the `config` field in the values.yaml. If pod IP does not suite your needs you can use `config` to set something different. + +See [Security Best Practices docummentation](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/security-best-practices.md#safeguards-against-denial-of-service-attacks) for more details. + ## 0.40.7 to 0.41.0 [Require Kubernetes version 1.23 or later](https://github.com/open-telemetry/opentelemetry-helm-charts/pull/541) 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 5d557e5f6..0db41e99f 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 @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" @@ -32,17 +32,17 @@ data: jaeger: protocols: grpc: - endpoint: 0.0.0.0:14250 + endpoint: ${MY_POD_IP}:14250 thrift_compact: - endpoint: 0.0.0.0:6831 + endpoint: ${MY_POD_IP}:6831 thrift_http: - endpoint: 0.0.0.0:14268 + endpoint: ${MY_POD_IP}:14268 otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${MY_POD_IP}:4318 prometheus: config: scrape_configs: @@ -52,7 +52,7 @@ data: - targets: - ${MY_POD_IP}:8888 zipkin: - endpoint: 0.0.0.0:9411 + endpoint: ${MY_POD_IP}:9411 service: extensions: - health_check @@ -90,4 +90,4 @@ data: - zipkin telemetry: metrics: - address: 0.0.0.0:8888 + address: ${MY_POD_IP}:8888 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 617fa5699..6ac7dde9b 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" @@ -28,17 +28,17 @@ data: jaeger: protocols: grpc: - endpoint: 0.0.0.0:14250 + endpoint: ${MY_POD_IP}:14250 thrift_compact: - endpoint: 0.0.0.0:6831 + endpoint: ${MY_POD_IP}:6831 thrift_http: - endpoint: 0.0.0.0:14268 + endpoint: ${MY_POD_IP}:14268 otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${MY_POD_IP}:4318 prometheus: config: scrape_configs: @@ -48,7 +48,7 @@ data: - targets: - ${MY_POD_IP}:8888 zipkin: - endpoint: 0.0.0.0:9411 + endpoint: ${MY_POD_IP}:9411 service: extensions: - health_check @@ -83,4 +83,4 @@ data: - zipkin telemetry: metrics: - address: 0.0.0.0:8888 + address: ${MY_POD_IP}:8888 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 79e3f15c6..c0fabd43d 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml @@ -5,7 +5,7 @@ kind: DaemonSet metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: 0b96743da5cd5740a8063f8b92bb6860ed710495e680251a50571336fd3c07de + checksum/config: 78c19387765675847130e72a7c960ec26352d91902de9be32b65736b42fc4087 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 ba9572391..a3de03c47 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: ba8a23c366836d2a9bcc5303a1149f1bdf3564710a1000b63f26bbdf607c85d9 + checksum/config: 3002b94531ad9701402779d72014f5a9edc30c18dfc2eb4db9196f10701372df 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 1dde7aa40..8b0f6d7ae 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.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 4f14a5511..d9402a89b 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.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 3113d9a65..f66e444d0 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 @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" @@ -91,17 +91,17 @@ data: jaeger: protocols: grpc: - endpoint: 0.0.0.0:14250 + endpoint: ${MY_POD_IP}:14250 thrift_compact: - endpoint: 0.0.0.0:6831 + endpoint: ${MY_POD_IP}:6831 thrift_http: - endpoint: 0.0.0.0:14268 + endpoint: ${MY_POD_IP}:14268 otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${MY_POD_IP}:4318 prometheus: config: scrape_configs: @@ -111,7 +111,7 @@ data: - targets: - ${MY_POD_IP}:8888 zipkin: - endpoint: 0.0.0.0:9411 + endpoint: ${MY_POD_IP}:9411 service: extensions: - health_check @@ -147,4 +147,4 @@ data: - zipkin telemetry: metrics: - address: 0.0.0.0:8888 + address: ${MY_POD_IP}:8888 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 947323dfc..6b56795c5 100644 --- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml @@ -5,7 +5,7 @@ kind: DaemonSet metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: 56d523705698b5a92328c5a5f72c18093bbe7c9f40245cf879103ce5140b727e + checksum/config: 79989873ece3d11fbd70e7e14d31e6e9269dbd3f4b4f5a95f850613be1258fbd 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 4f14a5511..d9402a89b 100644 --- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.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 14e5c726d..9f627d203 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" @@ -74,17 +74,17 @@ data: jaeger: protocols: grpc: - endpoint: 0.0.0.0:14250 + endpoint: ${MY_POD_IP}:14250 thrift_compact: - endpoint: 0.0.0.0:6831 + endpoint: ${MY_POD_IP}:6831 thrift_http: - endpoint: 0.0.0.0:14268 + endpoint: ${MY_POD_IP}:14268 otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${MY_POD_IP}:4318 prometheus: config: scrape_configs: @@ -94,7 +94,7 @@ data: - targets: - ${MY_POD_IP}:8888 zipkin: - endpoint: 0.0.0.0:9411 + endpoint: ${MY_POD_IP}:9411 service: extensions: - health_check @@ -130,4 +130,4 @@ data: - zipkin telemetry: metrics: - address: 0.0.0.0:8888 + address: ${MY_POD_IP}:8888 diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml index 5eba57cd4..698b5bc93 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml @@ -5,7 +5,7 @@ kind: DaemonSet metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: 36ead224aa32acc78d483fdb6affd1c2a70c7d7df1bc0a4045c97ceab1cb829e + checksum/config: 13c2e635e9a3a677b4754fe2a512078b690ef73bd5ce0cc32341bda6f12783af 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 4f14a5511..d9402a89b 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.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 8b3a20f19..eed9cd030 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 @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" @@ -28,17 +28,17 @@ data: jaeger: protocols: grpc: - endpoint: 0.0.0.0:14250 + endpoint: ${MY_POD_IP}:14250 thrift_compact: - endpoint: 0.0.0.0:6831 + endpoint: ${MY_POD_IP}:6831 thrift_http: - endpoint: 0.0.0.0:14268 + endpoint: ${MY_POD_IP}:14268 otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${MY_POD_IP}:4318 prometheus: config: scrape_configs: @@ -48,7 +48,7 @@ data: - targets: - ${MY_POD_IP}:8888 zipkin: - endpoint: 0.0.0.0:9411 + endpoint: ${MY_POD_IP}:9411 service: extensions: - health_check @@ -83,4 +83,4 @@ data: - zipkin telemetry: metrics: - address: 0.0.0.0:8888 + address: ${MY_POD_IP}:8888 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 7cdf619e1..862596417 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml @@ -5,7 +5,7 @@ kind: DaemonSet metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: b19470e368618d9fd58f7491f9ce0857b760fd2a9c1775d75152ea82c72c24ef + checksum/config: a658be438c90e114ca3e8932a1ccd06f2f1085787812a2a69204740efa5e9298 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 4f14a5511..d9402a89b 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.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 8b3a20f19..eed9cd030 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" @@ -28,17 +28,17 @@ data: jaeger: protocols: grpc: - endpoint: 0.0.0.0:14250 + endpoint: ${MY_POD_IP}:14250 thrift_compact: - endpoint: 0.0.0.0:6831 + endpoint: ${MY_POD_IP}:6831 thrift_http: - endpoint: 0.0.0.0:14268 + endpoint: ${MY_POD_IP}:14268 otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${MY_POD_IP}:4318 prometheus: config: scrape_configs: @@ -48,7 +48,7 @@ data: - targets: - ${MY_POD_IP}:8888 zipkin: - endpoint: 0.0.0.0:9411 + endpoint: ${MY_POD_IP}:9411 service: extensions: - health_check @@ -83,4 +83,4 @@ data: - zipkin telemetry: metrics: - address: 0.0.0.0:8888 + address: ${MY_POD_IP}:8888 diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml index 2ac50a854..9c9103cb7 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml @@ -5,7 +5,7 @@ kind: DaemonSet metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: b19470e368618d9fd58f7491f9ce0857b760fd2a9c1775d75152ea82c72c24ef + checksum/config: a658be438c90e114ca3e8932a1ccd06f2f1085787812a2a69204740efa5e9298 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 4f14a5511..d9402a89b 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml index 617fa5699..6ac7dde9b 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" @@ -28,17 +28,17 @@ data: jaeger: protocols: grpc: - endpoint: 0.0.0.0:14250 + endpoint: ${MY_POD_IP}:14250 thrift_compact: - endpoint: 0.0.0.0:6831 + endpoint: ${MY_POD_IP}:6831 thrift_http: - endpoint: 0.0.0.0:14268 + endpoint: ${MY_POD_IP}:14268 otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${MY_POD_IP}:4318 prometheus: config: scrape_configs: @@ -48,7 +48,7 @@ data: - targets: - ${MY_POD_IP}:8888 zipkin: - endpoint: 0.0.0.0:9411 + endpoint: ${MY_POD_IP}:9411 service: extensions: - health_check @@ -83,4 +83,4 @@ data: - zipkin telemetry: metrics: - address: 0.0.0.0:8888 + address: ${MY_POD_IP}:8888 diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml index 773d129a2..7d10df802 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: ba8a23c366836d2a9bcc5303a1149f1bdf3564710a1000b63f26bbdf607c85d9 + checksum/config: 3002b94531ad9701402779d72014f5a9edc30c18dfc2eb4db9196f10701372df 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 1dde7aa40..8b0f6d7ae 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml index 4f14a5511..d9402a89b 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.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 801428c6a..87b9e5731 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" @@ -28,9 +28,9 @@ data: otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${MY_POD_IP}:4318 service: extensions: - health_check @@ -46,4 +46,4 @@ data: - otlp telemetry: metrics: - address: 0.0.0.0:8888 + address: ${MY_POD_IP}:8888 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 e1a3e7aa7..31dfe7c34 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: 4aa96ca050f26f7ae4a1be2ea8015ece9787f0f2044666c5df0411468a2d8a57 + checksum/config: c3e20ad7e830648d8880fbc015a2e8db7264f05c11b5f8a88383bc59dab02afc 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 cac04a964..eaa44a348 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.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 4f14a5511..d9402a89b 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.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 bd0586329..38219c6d7 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 @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.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 1dde7aa40..8b0f6d7ae 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 @@ -5,7 +5,7 @@ kind: Service metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.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 4f14a5511..d9402a89b 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 @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.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 e90f08a82..7e13e64d0 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector-statefulset labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" @@ -28,17 +28,17 @@ data: jaeger: protocols: grpc: - endpoint: 0.0.0.0:14250 + endpoint: ${MY_POD_IP}:14250 thrift_compact: - endpoint: 0.0.0.0:6831 + endpoint: ${MY_POD_IP}:6831 thrift_http: - endpoint: 0.0.0.0:14268 + endpoint: ${MY_POD_IP}:14268 otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${MY_POD_IP}:4318 prometheus: config: scrape_configs: @@ -48,7 +48,7 @@ data: - targets: - ${MY_POD_IP}:8888 zipkin: - endpoint: 0.0.0.0:9411 + endpoint: ${MY_POD_IP}:9411 service: extensions: - health_check @@ -83,4 +83,4 @@ data: - zipkin telemetry: metrics: - address: 0.0.0.0:8888 + address: ${MY_POD_IP}:8888 diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml index c3c179d55..59bf41a64 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml index 4f14a5511..d9402a89b 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml index 528015696..b4cb2e090 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.46.0 + helm.sh/chart: opentelemetry-collector-0.47.0 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.70.0" diff --git a/charts/opentelemetry-collector/templates/NOTES.txt b/charts/opentelemetry-collector/templates/NOTES.txt index 2b6f2b61f..865dfacbb 100644 --- a/charts/opentelemetry-collector/templates/NOTES.txt +++ b/charts/opentelemetry-collector/templates/NOTES.txt @@ -22,6 +22,8 @@ [WARNING] 'containerLogs' is deprecated. Use 'presets.logsCollection' instead. See https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/charts/opentelemetry-collector/UPGRADING.md#0231-to-0240 for instructions on how to migrate. {{ end }} +[INFO] as of chart version 0.47.0 the default collector configuration has been updated to use pod IP instead of 0.0.0.0 for its endpoints. See https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/charts/opentelemetry-collector/UPGRADING.md#0460-to-0470 for details. + {{- if .Values.presets.clusterMetrics.enabled }} {{- if eq .Values.mode "daemonset"}} {{- fail "Cluster Metrics preset is not suitable for daemonset mode. Please use statefulset or deployment mode with replicaCount: 1"}} diff --git a/charts/opentelemetry-collector/values.yaml b/charts/opentelemetry-collector/values.yaml index af835999c..e4a8f07c4 100644 --- a/charts/opentelemetry-collector/values.yaml +++ b/charts/opentelemetry-collector/values.yaml @@ -77,17 +77,17 @@ config: jaeger: protocols: grpc: - endpoint: 0.0.0.0:14250 + endpoint: ${MY_POD_IP}:14250 thrift_http: - endpoint: 0.0.0.0:14268 + endpoint: ${MY_POD_IP}:14268 thrift_compact: - endpoint: 0.0.0.0:6831 + endpoint: ${MY_POD_IP}:6831 otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: ${MY_POD_IP}:4317 http: - endpoint: 0.0.0.0:4318 + endpoint: ${MY_POD_IP}:4318 prometheus: config: scrape_configs: @@ -97,11 +97,11 @@ config: - targets: - ${MY_POD_IP}:8888 zipkin: - endpoint: 0.0.0.0:9411 + endpoint: ${MY_POD_IP}:9411 service: telemetry: metrics: - address: 0.0.0.0:8888 + address: ${MY_POD_IP}:8888 extensions: - health_check - memory_ballast