Skip to content

Commit 0784f1c

Browse files
zirainzhaohuabing
zirain
authored and
zhaohuabing
committed
helm: make eg-addons support IPv6 cluster (envoyproxy#4559)
Signed-off-by: zirain <[email protected]> (cherry picked from commit b0c6f8c) Signed-off-by: Huabing Zhao <[email protected]>
1 parent a1529b8 commit 0784f1c

File tree

5 files changed

+77
-39
lines changed

5 files changed

+77
-39
lines changed

‎charts/gateway-addons-helm/README.md

+13-6
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,21 @@ To uninstall the chart:
107107
| opentelemetry-collector.config.exporters.loki.endpoint | string | `"http://loki.monitoring.svc:3100/loki/api/v1/push"` | |
108108
| opentelemetry-collector.config.exporters.otlp.endpoint | string | `"tempo.monitoring.svc:4317"` | |
109109
| opentelemetry-collector.config.exporters.otlp.tls.insecure | bool | `true` | |
110-
| opentelemetry-collector.config.exporters.prometheus.endpoint | string | `"0.0.0.0:19001"` | |
111-
| opentelemetry-collector.config.extensions.health_check | object | `{}` | |
110+
| opentelemetry-collector.config.exporters.prometheus.endpoint | string | `"[${env:MY_POD_IP}]:19001"` | |
111+
| opentelemetry-collector.config.extensions.health_check.endpoint | string | `"[${env:MY_POD_IP}]:13133"` | |
112112
| opentelemetry-collector.config.processors.attributes.actions[0].action | string | `"insert"` | |
113113
| opentelemetry-collector.config.processors.attributes.actions[0].key | string | `"loki.attribute.labels"` | |
114114
| opentelemetry-collector.config.processors.attributes.actions[0].value | string | `"k8s.pod.name, k8s.namespace.name"` | |
115-
| opentelemetry-collector.config.receivers.datadog.endpoint | string | `"${env:MY_POD_IP}:8126"` | |
116-
| opentelemetry-collector.config.receivers.otlp.protocols.grpc.endpoint | string | `"${env:MY_POD_IP}:4317"` | |
117-
| opentelemetry-collector.config.receivers.otlp.protocols.http.endpoint | string | `"${env:MY_POD_IP}:4318"` | |
118-
| opentelemetry-collector.config.receivers.zipkin.endpoint | string | `"${env:MY_POD_IP}:9411"` | |
115+
| opentelemetry-collector.config.receivers.datadog.endpoint | string | `"[${env:MY_POD_IP}]:8126"` | |
116+
| opentelemetry-collector.config.receivers.jaeger.protocols.grpc.endpoint | string | `"[${env:MY_POD_IP}]:14250"` | |
117+
| opentelemetry-collector.config.receivers.jaeger.protocols.thrift_compact.endpoint | string | `"[${env:MY_POD_IP}]:6831"` | |
118+
| opentelemetry-collector.config.receivers.jaeger.protocols.thrift_http.endpoint | string | `"[${env:MY_POD_IP}]:14268"` | |
119+
| opentelemetry-collector.config.receivers.otlp.protocols.grpc.endpoint | string | `"[${env:MY_POD_IP}]:4317"` | |
120+
| opentelemetry-collector.config.receivers.otlp.protocols.http.endpoint | string | `"[${env:MY_POD_IP}]:4318"` | |
121+
| opentelemetry-collector.config.receivers.prometheus.config.scrape_configs[0].job_name | string | `"opentelemetry-collector"` | |
122+
| opentelemetry-collector.config.receivers.prometheus.config.scrape_configs[0].scrape_interval | string | `"10s"` | |
123+
| opentelemetry-collector.config.receivers.prometheus.config.scrape_configs[0].static_configs[0].targets[0] | string | `"[${env:MY_POD_IP}]:8888"` | |
124+
| opentelemetry-collector.config.receivers.zipkin.endpoint | string | `"[${env:MY_POD_IP}]:9411"` | |
119125
| opentelemetry-collector.config.service.extensions[0] | string | `"health_check"` | |
120126
| opentelemetry-collector.config.service.pipelines.logs.exporters[0] | string | `"loki"` | |
121127
| opentelemetry-collector.config.service.pipelines.logs.processors[0] | string | `"attributes"` | |
@@ -127,6 +133,7 @@ To uninstall the chart:
127133
| opentelemetry-collector.config.service.pipelines.traces.receivers[0] | string | `"datadog"` | |
128134
| opentelemetry-collector.config.service.pipelines.traces.receivers[1] | string | `"otlp"` | |
129135
| opentelemetry-collector.config.service.pipelines.traces.receivers[2] | string | `"zipkin"` | |
136+
| opentelemetry-collector.config.service.telemetry.metrics.address | string | `"[${env:MY_POD_IP}]:8888"` | |
130137
| opentelemetry-collector.enabled | bool | `false` | |
131138
| opentelemetry-collector.fullnameOverride | string | `"otel-collector"` | |
132139
| opentelemetry-collector.image.repository | string | `"otel/opentelemetry-collector-contrib"` | |

‎charts/gateway-addons-helm/values.yaml

+26-9
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ opentelemetry-collector:
186186
config:
187187
exporters:
188188
prometheus:
189-
endpoint: 0.0.0.0:19001
189+
endpoint: "[${env:MY_POD_IP}]:19001"
190190
debug:
191191
verbosity: detailed
192192
loki:
@@ -196,10 +196,8 @@ opentelemetry-collector:
196196
tls:
197197
insecure: true
198198
extensions:
199-
# The health_check extension is mandatory for this chart.
200-
# Without the health_check extension the collector will fail the readiness and liveliness probes.
201-
# The health_check extension can be modified, but should never be removed.
202-
health_check: {}
199+
health_check:
200+
endpoint: "[${env:MY_POD_IP}]:13133"
203201
processors:
204202
attributes:
205203
actions:
@@ -209,17 +207,36 @@ opentelemetry-collector:
209207
# Loki will convert this to k8s_pod_name label.
210208
value: k8s.pod.name, k8s.namespace.name
211209
receivers:
210+
jaeger:
211+
protocols:
212+
grpc:
213+
endpoint: "[${env:MY_POD_IP}]:14250"
214+
thrift_http:
215+
endpoint: "[${env:MY_POD_IP}]:14268"
216+
thrift_compact:
217+
endpoint: "[${env:MY_POD_IP}]:6831"
212218
datadog:
213-
endpoint: ${env:MY_POD_IP}:8126
219+
endpoint: "[${env:MY_POD_IP}]:8126"
214220
zipkin:
215-
endpoint: ${env:MY_POD_IP}:9411
221+
endpoint: "[${env:MY_POD_IP}]:9411"
216222
otlp:
217223
protocols:
218224
grpc:
219-
endpoint: ${env:MY_POD_IP}:4317
225+
endpoint: "[${env:MY_POD_IP}]:4317"
220226
http:
221-
endpoint: ${env:MY_POD_IP}:4318
227+
endpoint: "[${env:MY_POD_IP}]:4318"
228+
prometheus:
229+
config:
230+
scrape_configs:
231+
- job_name: opentelemetry-collector
232+
scrape_interval: 10s
233+
static_configs:
234+
- targets:
235+
- "[${env:MY_POD_IP}]:8888"
222236
service:
237+
telemetry:
238+
metrics:
239+
address: "[${env:MY_POD_IP}]:8888"
223240
extensions:
224241
- health_check
225242
pipelines:

‎site/content/en/latest/install/gateway-addons-helm-api.md

+13-6
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,21 @@ An Add-ons Helm chart for Envoy Gateway
8686
| opentelemetry-collector.config.exporters.loki.endpoint | string | `"http://loki.monitoring.svc:3100/loki/api/v1/push"` | |
8787
| opentelemetry-collector.config.exporters.otlp.endpoint | string | `"tempo.monitoring.svc:4317"` | |
8888
| opentelemetry-collector.config.exporters.otlp.tls.insecure | bool | `true` | |
89-
| opentelemetry-collector.config.exporters.prometheus.endpoint | string | `"0.0.0.0:19001"` | |
90-
| opentelemetry-collector.config.extensions.health_check | object | `{}` | |
89+
| opentelemetry-collector.config.exporters.prometheus.endpoint | string | `"[${env:MY_POD_IP}]:19001"` | |
90+
| opentelemetry-collector.config.extensions.health_check.endpoint | string | `"[${env:MY_POD_IP}]:13133"` | |
9191
| opentelemetry-collector.config.processors.attributes.actions[0].action | string | `"insert"` | |
9292
| opentelemetry-collector.config.processors.attributes.actions[0].key | string | `"loki.attribute.labels"` | |
9393
| opentelemetry-collector.config.processors.attributes.actions[0].value | string | `"k8s.pod.name, k8s.namespace.name"` | |
94-
| opentelemetry-collector.config.receivers.datadog.endpoint | string | `"${env:MY_POD_IP}:8126"` | |
95-
| opentelemetry-collector.config.receivers.otlp.protocols.grpc.endpoint | string | `"${env:MY_POD_IP}:4317"` | |
96-
| opentelemetry-collector.config.receivers.otlp.protocols.http.endpoint | string | `"${env:MY_POD_IP}:4318"` | |
97-
| opentelemetry-collector.config.receivers.zipkin.endpoint | string | `"${env:MY_POD_IP}:9411"` | |
94+
| opentelemetry-collector.config.receivers.datadog.endpoint | string | `"[${env:MY_POD_IP}]:8126"` | |
95+
| opentelemetry-collector.config.receivers.jaeger.protocols.grpc.endpoint | string | `"[${env:MY_POD_IP}]:14250"` | |
96+
| opentelemetry-collector.config.receivers.jaeger.protocols.thrift_compact.endpoint | string | `"[${env:MY_POD_IP}]:6831"` | |
97+
| opentelemetry-collector.config.receivers.jaeger.protocols.thrift_http.endpoint | string | `"[${env:MY_POD_IP}]:14268"` | |
98+
| opentelemetry-collector.config.receivers.otlp.protocols.grpc.endpoint | string | `"[${env:MY_POD_IP}]:4317"` | |
99+
| opentelemetry-collector.config.receivers.otlp.protocols.http.endpoint | string | `"[${env:MY_POD_IP}]:4318"` | |
100+
| opentelemetry-collector.config.receivers.prometheus.config.scrape_configs[0].job_name | string | `"opentelemetry-collector"` | |
101+
| opentelemetry-collector.config.receivers.prometheus.config.scrape_configs[0].scrape_interval | string | `"10s"` | |
102+
| opentelemetry-collector.config.receivers.prometheus.config.scrape_configs[0].static_configs[0].targets[0] | string | `"[${env:MY_POD_IP}]:8888"` | |
103+
| opentelemetry-collector.config.receivers.zipkin.endpoint | string | `"[${env:MY_POD_IP}]:9411"` | |
98104
| opentelemetry-collector.config.service.extensions[0] | string | `"health_check"` | |
99105
| opentelemetry-collector.config.service.pipelines.logs.exporters[0] | string | `"loki"` | |
100106
| opentelemetry-collector.config.service.pipelines.logs.processors[0] | string | `"attributes"` | |
@@ -106,6 +112,7 @@ An Add-ons Helm chart for Envoy Gateway
106112
| opentelemetry-collector.config.service.pipelines.traces.receivers[0] | string | `"datadog"` | |
107113
| opentelemetry-collector.config.service.pipelines.traces.receivers[1] | string | `"otlp"` | |
108114
| opentelemetry-collector.config.service.pipelines.traces.receivers[2] | string | `"zipkin"` | |
115+
| opentelemetry-collector.config.service.telemetry.metrics.address | string | `"[${env:MY_POD_IP}]:8888"` | |
109116
| opentelemetry-collector.enabled | bool | `false` | |
110117
| opentelemetry-collector.fullnameOverride | string | `"otel-collector"` | |
111118
| opentelemetry-collector.image.repository | string | `"otel/opentelemetry-collector-contrib"` | |

‎site/content/zh/latest/install/gateway-addons-helm-api.md

+13-6
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,21 @@ An Add-ons Helm chart for Envoy Gateway
8686
| opentelemetry-collector.config.exporters.loki.endpoint | string | `"http://loki.monitoring.svc:3100/loki/api/v1/push"` | |
8787
| opentelemetry-collector.config.exporters.otlp.endpoint | string | `"tempo.monitoring.svc:4317"` | |
8888
| opentelemetry-collector.config.exporters.otlp.tls.insecure | bool | `true` | |
89-
| opentelemetry-collector.config.exporters.prometheus.endpoint | string | `"0.0.0.0:19001"` | |
90-
| opentelemetry-collector.config.extensions.health_check | object | `{}` | |
89+
| opentelemetry-collector.config.exporters.prometheus.endpoint | string | `"[${env:MY_POD_IP}]:19001"` | |
90+
| opentelemetry-collector.config.extensions.health_check.endpoint | string | `"[${env:MY_POD_IP}]:13133"` | |
9191
| opentelemetry-collector.config.processors.attributes.actions[0].action | string | `"insert"` | |
9292
| opentelemetry-collector.config.processors.attributes.actions[0].key | string | `"loki.attribute.labels"` | |
9393
| opentelemetry-collector.config.processors.attributes.actions[0].value | string | `"k8s.pod.name, k8s.namespace.name"` | |
94-
| opentelemetry-collector.config.receivers.datadog.endpoint | string | `"${env:MY_POD_IP}:8126"` | |
95-
| opentelemetry-collector.config.receivers.otlp.protocols.grpc.endpoint | string | `"${env:MY_POD_IP}:4317"` | |
96-
| opentelemetry-collector.config.receivers.otlp.protocols.http.endpoint | string | `"${env:MY_POD_IP}:4318"` | |
97-
| opentelemetry-collector.config.receivers.zipkin.endpoint | string | `"${env:MY_POD_IP}:9411"` | |
94+
| opentelemetry-collector.config.receivers.datadog.endpoint | string | `"[${env:MY_POD_IP}]:8126"` | |
95+
| opentelemetry-collector.config.receivers.jaeger.protocols.grpc.endpoint | string | `"[${env:MY_POD_IP}]:14250"` | |
96+
| opentelemetry-collector.config.receivers.jaeger.protocols.thrift_compact.endpoint | string | `"[${env:MY_POD_IP}]:6831"` | |
97+
| opentelemetry-collector.config.receivers.jaeger.protocols.thrift_http.endpoint | string | `"[${env:MY_POD_IP}]:14268"` | |
98+
| opentelemetry-collector.config.receivers.otlp.protocols.grpc.endpoint | string | `"[${env:MY_POD_IP}]:4317"` | |
99+
| opentelemetry-collector.config.receivers.otlp.protocols.http.endpoint | string | `"[${env:MY_POD_IP}]:4318"` | |
100+
| opentelemetry-collector.config.receivers.prometheus.config.scrape_configs[0].job_name | string | `"opentelemetry-collector"` | |
101+
| opentelemetry-collector.config.receivers.prometheus.config.scrape_configs[0].scrape_interval | string | `"10s"` | |
102+
| opentelemetry-collector.config.receivers.prometheus.config.scrape_configs[0].static_configs[0].targets[0] | string | `"[${env:MY_POD_IP}]:8888"` | |
103+
| opentelemetry-collector.config.receivers.zipkin.endpoint | string | `"[${env:MY_POD_IP}]:9411"` | |
98104
| opentelemetry-collector.config.service.extensions[0] | string | `"health_check"` | |
99105
| opentelemetry-collector.config.service.pipelines.logs.exporters[0] | string | `"loki"` | |
100106
| opentelemetry-collector.config.service.pipelines.logs.processors[0] | string | `"attributes"` | |
@@ -106,6 +112,7 @@ An Add-ons Helm chart for Envoy Gateway
106112
| opentelemetry-collector.config.service.pipelines.traces.receivers[0] | string | `"datadog"` | |
107113
| opentelemetry-collector.config.service.pipelines.traces.receivers[1] | string | `"otlp"` | |
108114
| opentelemetry-collector.config.service.pipelines.traces.receivers[2] | string | `"zipkin"` | |
115+
| opentelemetry-collector.config.service.telemetry.metrics.address | string | `"[${env:MY_POD_IP}]:8888"` | |
109116
| opentelemetry-collector.enabled | bool | `false` | |
110117
| opentelemetry-collector.fullnameOverride | string | `"otel-collector"` | |
111118
| opentelemetry-collector.image.repository | string | `"otel/opentelemetry-collector-contrib"` | |

‎test/helm/gateway-addons-helm/e2e.out.yaml

+12-12
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,10 @@ data:
237237
tls:
238238
insecure: true
239239
prometheus:
240-
endpoint: 0.0.0.0:19001
240+
endpoint: '[${env:MY_POD_IP}]:19001'
241241
extensions:
242242
health_check:
243-
endpoint: ${env:MY_POD_IP}:13133
243+
endpoint: '[${env:MY_POD_IP}]:13133'
244244
processors:
245245
attributes:
246246
actions:
@@ -254,31 +254,31 @@ data:
254254
spike_limit_percentage: 25
255255
receivers:
256256
datadog:
257-
endpoint: ${env:MY_POD_IP}:8126
257+
endpoint: '[${env:MY_POD_IP}]:8126'
258258
jaeger:
259259
protocols:
260260
grpc:
261-
endpoint: ${env:MY_POD_IP}:14250
261+
endpoint: '[${env:MY_POD_IP}]:14250'
262262
thrift_compact:
263-
endpoint: ${env:MY_POD_IP}:6831
263+
endpoint: '[${env:MY_POD_IP}]:6831'
264264
thrift_http:
265-
endpoint: ${env:MY_POD_IP}:14268
265+
endpoint: '[${env:MY_POD_IP}]:14268'
266266
otlp:
267267
protocols:
268268
grpc:
269-
endpoint: ${env:MY_POD_IP}:4317
269+
endpoint: '[${env:MY_POD_IP}]:4317'
270270
http:
271-
endpoint: ${env:MY_POD_IP}:4318
271+
endpoint: '[${env:MY_POD_IP}]:4318'
272272
prometheus:
273273
config:
274274
scrape_configs:
275275
- job_name: opentelemetry-collector
276276
scrape_interval: 10s
277277
static_configs:
278278
- targets:
279-
- ${env:MY_POD_IP}:8888
279+
- '[${env:MY_POD_IP}]:8888'
280280
zipkin:
281-
endpoint: ${env:MY_POD_IP}:9411
281+
endpoint: '[${env:MY_POD_IP}]:9411'
282282
service:
283283
extensions:
284284
- health_check
@@ -311,7 +311,7 @@ data:
311311
- zipkin
312312
telemetry:
313313
metrics:
314-
address: ${env:MY_POD_IP}:8888
314+
address: '[${env:MY_POD_IP}]:8888'
315315
---
316316
# Source: gateway-addons-helm/charts/prometheus/templates/cm.yaml
317317
apiVersion: v1
@@ -9756,7 +9756,7 @@ spec:
97569756
template:
97579757
metadata:
97589758
annotations:
9759-
checksum/config: 270a8503091b51a264317115cf6df46b4501b03fc135eca95b93dca57a522a70
9759+
checksum/config: 77c11cf41a890ec6a75a644880450d53887eca3e37511c3139cf0b3e8ebbe1ee
97609760

97619761
labels:
97629762
app.kubernetes.io/name: opentelemetry-collector

0 commit comments

Comments
 (0)