Skip to content

Commit 1c82d9f

Browse files
authored
explicitly set healthcheck extension endpoint (#1012)
1 parent bf85e1b commit 1c82d9f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+90
-67
lines changed

charts/opentelemetry-collector/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: opentelemetry-collector
3-
version: 0.78.2
3+
version: 0.78.3
44
description: OpenTelemetry Collector Helm chart for Kubernetes
55
type: application
66
home: https://opentelemetry.io/

charts/opentelemetry-collector/UPGRADING.md

+11
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,17 @@ created but the Memory Ballast Extension will still be removed.
1616
Depending on the progress made in [Issue 891](https://github.com/open-telemetry/opentelemetry-helm-charts/issues/891),
1717
the use of `GOMEMLIMIT` may completely replace the Memory Ballast Extension in the future.
1818

19+
## 0.78.2 to 0.78.3
20+
21+
[Update Health Check Extension's endpoints to use Pod IP Instead of 0.0.0.0](https://github.com/open-telemetry/opentelemetry-helm-charts/pull/1012)
22+
23+
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.
24+
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`.
25+
26+
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.
27+
28+
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.
29+
1930
## 0.75.1 to 0.76.0
2031

2132
Enable the `useGOMEMLIMIT` feature flag by default. This means by default the chart now does not use the Memory Ballast Extension and any custom configuraiton applied to the Memory Ballast Extension is ignored.

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -22,7 +22,8 @@ data:
2222
tls:
2323
insecure: true
2424
extensions:
25-
health_check: {}
25+
health_check:
26+
endpoint: ${env:MY_POD_IP}:13133
2627
processors:
2728
batch: {}
2829
memory_limiter:

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -18,7 +18,8 @@ data:
1818
debug: {}
1919
logging: {}
2020
extensions:
21-
health_check: {}
21+
health_check:
22+
endpoint: ${env:MY_POD_IP}:13133
2223
processors:
2324
batch: {}
2425
memory_limiter:

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: fb39898a2648ea8ed0c3efcdb70ec896a0c00648b925a707bd013293be5f5db9
26+
checksum/config: 0596edff913b094144864511340802bd33b446b9d0e89d9df7b9e8a34e2ba28d
2727

2828
labels:
2929
app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -25,7 +25,7 @@ spec:
2525
template:
2626
metadata:
2727
annotations:
28-
checksum/config: f00dc9e128c387ab0642b1549a310ad130230b4121eaa55dd9a59e3216f288be
28+
checksum/config: f0aa5d67c8ca9f4782e35fd49e28063db4eeb63783d98b134f49b364520631bd
2929

3030
labels:
3131
app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -18,7 +18,8 @@ data:
1818
debug: {}
1919
logging: {}
2020
extensions:
21-
health_check: {}
21+
health_check:
22+
endpoint: ${env:MY_POD_IP}:13133
2223
processors:
2324
batch: {}
2425
memory_limiter:

charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: acb45551cd5fdfa669938ce1a715b63ac3014666408628b4a4270d37da2a8ff3
26+
checksum/config: 93dcfdd0a9e47bb0d48c9cc4e6a993edb6c98319808a36fade0af16fdcc449c7
2727

2828
labels:
2929
app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -18,7 +18,8 @@ data:
1818
debug: {}
1919
logging: {}
2020
extensions:
21-
health_check: {}
21+
health_check:
22+
endpoint: ${env:MY_POD_IP}:13133
2223
processors:
2324
batch: {}
2425
memory_limiter:

charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: ec9b1ed0709fbbb6b075002defa83b2778a7e4e991904264b82b495421c6bc3c
26+
checksum/config: cc03902a5aaf4ef0b6e974705c56a4b64b740ef0981295dcf43875f8086ec8d5
2727

2828
labels:
2929
app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -18,7 +18,8 @@ data:
1818
debug: {}
1919
logging: {}
2020
extensions:
21-
health_check: {}
21+
health_check:
22+
endpoint: ${env:MY_POD_IP}:13133
2223
processors:
2324
batch: {}
2425
memory_limiter:

charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: a098f93327d80effb53a5ccd20c38d735e7b6db18a24f9603f6b8eb6f974eed3
26+
checksum/config: 8e650593a941669729575a0daa31494a4687e1e7f7a75e98cffb703eff4063ac
2727

2828
labels:
2929
app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -18,7 +18,8 @@ data:
1818
debug: {}
1919
logging: {}
2020
extensions:
21-
health_check: {}
21+
health_check:
22+
endpoint: ${env:MY_POD_IP}:13133
2223
processors:
2324
batch: {}
2425
memory_limiter:

charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: a098f93327d80effb53a5ccd20c38d735e7b6db18a24f9603f6b8eb6f974eed3
26+
checksum/config: 8e650593a941669729575a0daa31494a4687e1e7f7a75e98cffb703eff4063ac
2727

2828
labels:
2929
app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -18,7 +18,8 @@ data:
1818
debug: {}
1919
logging: {}
2020
extensions:
21-
health_check: {}
21+
health_check:
22+
endpoint: ${env:MY_POD_IP}:13133
2223
processors:
2324
batch: {}
2425
memory_limiter:

charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -25,7 +25,7 @@ spec:
2525
template:
2626
metadata:
2727
annotations:
28-
checksum/config: f00dc9e128c387ab0642b1549a310ad130230b4121eaa55dd9a59e3216f288be
28+
checksum/config: f0aa5d67c8ca9f4782e35fd49e28063db4eeb63783d98b134f49b364520631bd
2929

3030
labels:
3131
app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -18,7 +18,8 @@ data:
1818
debug: {}
1919
logging: {}
2020
extensions:
21-
health_check: {}
21+
health_check:
22+
endpoint: ${env:MY_POD_IP}:13133
2223
processors:
2324
batch: {}
2425
memory_limiter:

charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.78.2
9+
helm.sh/chart: opentelemetry-collector-0.78.3
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -25,7 +25,7 @@ spec:
2525
template:
2626
metadata:
2727
annotations:
28-
checksum/config: 2c938c2d740f87e99b788f6101cfa87a044c6235c1c55f241199fbb558936046
28+
checksum/config: 3d0781eaf11d660c68f0729bfd30ebe66da994f342ed1df199fd6c04c3253bc3
2929

3030
labels:
3131
app.kubernetes.io/name: opentelemetry-collector

0 commit comments

Comments
 (0)