Skip to content

Commit a86da4b

Browse files
zhaohuabingzhaohuabing
committed
fix gen
Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com>
1 parent 58ea3c4 commit a86da4b

4 files changed

Lines changed: 60 additions & 30 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ An Add-ons Helm chart for Envoy Gateway
2626
| https://grafana.github.io/helm-charts | grafana | 10.5.15 |
2727
| https://grafana.github.io/helm-charts | loki | 6.55.0 |
2828
| https://grafana.github.io/helm-charts | tempo | 1.3.1 |
29-
| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.147.0 |
30-
| https://prometheus-community.github.io/helm-charts | prometheus | 28.13.0 |
29+
| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.147.1 |
30+
| https://prometheus-community.github.io/helm-charts | prometheus | 28.14.0 |
3131

3232
## Usage
3333

@@ -172,7 +172,7 @@ helm uninstall eg-addons -n monitoring
172172
| opentelemetry-collector.enabled | bool | `false` | |
173173
| opentelemetry-collector.fullnameOverride | string | `"otel-collector"` | |
174174
| opentelemetry-collector.image.repository | string | `"otel/opentelemetry-collector-contrib"` | |
175-
| opentelemetry-collector.image.tag | string | `"0.147.0"` | |
175+
| opentelemetry-collector.image.tag | string | `"0.148.0"` | |
176176
| opentelemetry-collector.mode | string | `"deployment"` | |
177177
| opentelemetry-collector.ports.datadog.containerPort | int | `8126` | |
178178
| opentelemetry-collector.ports.datadog.enabled | bool | `true` | |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ An Add-ons Helm chart for Envoy Gateway
2828
| https://grafana.github.io/helm-charts | grafana | 10.5.15 |
2929
| https://grafana.github.io/helm-charts | loki | 6.55.0 |
3030
| https://grafana.github.io/helm-charts | tempo | 1.3.1 |
31-
| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.147.0 |
32-
| https://prometheus-community.github.io/helm-charts | prometheus | 28.13.0 |
31+
| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.147.1 |
32+
| https://prometheus-community.github.io/helm-charts | prometheus | 28.14.0 |
3333

3434
## Values
3535

@@ -151,7 +151,7 @@ An Add-ons Helm chart for Envoy Gateway
151151
| opentelemetry-collector.enabled | bool | `false` | |
152152
| opentelemetry-collector.fullnameOverride | string | `"otel-collector"` | |
153153
| opentelemetry-collector.image.repository | string | `"otel/opentelemetry-collector-contrib"` | |
154-
| opentelemetry-collector.image.tag | string | `"0.147.0"` | |
154+
| opentelemetry-collector.image.tag | string | `"0.148.0"` | |
155155
| opentelemetry-collector.mode | string | `"deployment"` | |
156156
| opentelemetry-collector.ports.datadog.containerPort | int | `8126` | |
157157
| opentelemetry-collector.ports.datadog.enabled | bool | `true` | |

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ metadata:
4747
app.kubernetes.io/name: prometheus
4848
app.kubernetes.io/instance: gateway-addons-helm
4949
app.kubernetes.io/version: v3.10.0
50-
helm.sh/chart: prometheus-28.13.0
50+
helm.sh/chart: prometheus-28.14.0
5151
app.kubernetes.io/part-of: prometheus
5252
name: prometheus
5353
namespace: monitoring
@@ -314,7 +314,7 @@ metadata:
314314
app.kubernetes.io/name: prometheus
315315
app.kubernetes.io/instance: gateway-addons-helm
316316
app.kubernetes.io/version: v3.10.0
317-
helm.sh/chart: prometheus-28.13.0
317+
helm.sh/chart: prometheus-28.14.0
318318
app.kubernetes.io/part-of: prometheus
319319
name: prometheus
320320
namespace: monitoring
@@ -10001,7 +10001,7 @@ metadata:
1000110001
app.kubernetes.io/name: prometheus
1000210002
app.kubernetes.io/instance: gateway-addons-helm
1000310003
app.kubernetes.io/version: v3.10.0
10004-
helm.sh/chart: prometheus-28.13.0
10004+
helm.sh/chart: prometheus-28.14.0
1000510005
app.kubernetes.io/part-of: prometheus
1000610006
name: prometheus
1000710007
rules:
@@ -10108,7 +10108,7 @@ metadata:
1010810108
app.kubernetes.io/name: prometheus
1010910109
app.kubernetes.io/instance: gateway-addons-helm
1011010110
app.kubernetes.io/version: v3.10.0
10111-
helm.sh/chart: prometheus-28.13.0
10111+
helm.sh/chart: prometheus-28.14.0
1011210112
app.kubernetes.io/part-of: prometheus
1011310113
name: prometheus
1011410114
subjects:
@@ -10285,7 +10285,7 @@ metadata:
1028510285
app.kubernetes.io/name: prometheus
1028610286
app.kubernetes.io/instance: gateway-addons-helm
1028710287
app.kubernetes.io/version: v3.10.0
10288-
helm.sh/chart: prometheus-28.13.0
10288+
helm.sh/chart: prometheus-28.14.0
1028910289
app.kubernetes.io/part-of: prometheus
1029010290
name: prometheus
1029110291
namespace: monitoring
@@ -10584,7 +10584,7 @@ metadata:
1058410584
app.kubernetes.io/name: prometheus
1058510585
app.kubernetes.io/instance: gateway-addons-helm
1058610586
app.kubernetes.io/version: v3.10.0
10587-
helm.sh/chart: prometheus-28.13.0
10587+
helm.sh/chart: prometheus-28.14.0
1058810588
app.kubernetes.io/part-of: prometheus
1058910589
name: prometheus
1059010590
namespace: monitoring
@@ -10606,14 +10606,14 @@ spec:
1060610606
app.kubernetes.io/name: prometheus
1060710607
app.kubernetes.io/instance: gateway-addons-helm
1060810608
app.kubernetes.io/version: v3.10.0
10609-
helm.sh/chart: prometheus-28.13.0
10609+
helm.sh/chart: prometheus-28.14.0
1061010610
app.kubernetes.io/part-of: prometheus
1061110611
spec:
1061210612
enableServiceLinks: true
1061310613
serviceAccountName: prometheus
1061410614
containers:
1061510615
- name: prometheus-server-configmap-reload
10616-
image: "quay.io/prometheus-operator/prometheus-config-reloader:v0.89.0"
10616+
image: "quay.io/prometheus-operator/prometheus-config-reloader:v0.90.0"
1061710617
imagePullPolicy: "IfNotPresent"
1061810618
args:
1061910619
- --watched-dir=/etc/config

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

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ metadata:
3535
name: otel-collector
3636
namespace: monitoring
3737
labels:
38-
helm.sh/chart: opentelemetry-collector-0.147.0
38+
helm.sh/chart: opentelemetry-collector-0.147.1
3939
app.kubernetes.io/name: opentelemetry-collector
4040
app.kubernetes.io/instance: gateway-addons-helm
4141
app.kubernetes.io/version: "0.147.0"
@@ -52,7 +52,7 @@ metadata:
5252
app.kubernetes.io/name: prometheus
5353
app.kubernetes.io/instance: gateway-addons-helm
5454
app.kubernetes.io/version: v3.10.0
55-
helm.sh/chart: prometheus-28.13.0
55+
helm.sh/chart: prometheus-28.14.0
5656
app.kubernetes.io/part-of: prometheus
5757
name: prometheus
5858
namespace: monitoring
@@ -307,7 +307,7 @@ metadata:
307307
name: otel-collector
308308
namespace: monitoring
309309
labels:
310-
helm.sh/chart: opentelemetry-collector-0.147.0
310+
helm.sh/chart: opentelemetry-collector-0.147.1
311311
app.kubernetes.io/name: opentelemetry-collector
312312
app.kubernetes.io/instance: gateway-addons-helm
313313
app.kubernetes.io/version: "0.147.0"
@@ -452,6 +452,13 @@ data:
452452
prometheus:
453453
host: localhost
454454
port: 8888
455+
resource:
456+
host.name: ${env:OTEL_K8S_NODE_NAME}
457+
k8s.namespace.name: ${env:OTEL_K8S_NAMESPACE}
458+
k8s.node.ip: ${env:OTEL_K8S_NODE_IP}
459+
k8s.node.name: ${env:OTEL_K8S_NODE_NAME}
460+
k8s.pod.ip: ${env:OTEL_K8S_POD_IP}
461+
k8s.pod.name: ${env:OTEL_K8S_POD_NAME}
455462
---
456463
# Source: gateway-addons-helm/charts/prometheus/templates/cm.yaml
457464
apiVersion: v1
@@ -462,7 +469,7 @@ metadata:
462469
app.kubernetes.io/name: prometheus
463470
app.kubernetes.io/instance: gateway-addons-helm
464471
app.kubernetes.io/version: v3.10.0
465-
helm.sh/chart: prometheus-28.13.0
472+
helm.sh/chart: prometheus-28.14.0
466473
app.kubernetes.io/part-of: prometheus
467474
name: prometheus
468475
namespace: monitoring
@@ -10241,7 +10248,7 @@ kind: ClusterRole
1024110248
metadata:
1024210249
name: otel-collector
1024310250
labels:
10244-
helm.sh/chart: opentelemetry-collector-0.147.0
10251+
helm.sh/chart: opentelemetry-collector-0.147.1
1024510252
app.kubernetes.io/name: opentelemetry-collector
1024610253
app.kubernetes.io/instance: gateway-addons-helm
1024710254
app.kubernetes.io/version: "0.147.0"
@@ -10268,7 +10275,7 @@ metadata:
1026810275
app.kubernetes.io/name: prometheus
1026910276
app.kubernetes.io/instance: gateway-addons-helm
1027010277
app.kubernetes.io/version: v3.10.0
10271-
helm.sh/chart: prometheus-28.13.0
10278+
helm.sh/chart: prometheus-28.14.0
1027210279
app.kubernetes.io/part-of: prometheus
1027310280
name: prometheus
1027410281
rules:
@@ -10355,7 +10362,7 @@ kind: ClusterRoleBinding
1035510362
metadata:
1035610363
name: otel-collector
1035710364
labels:
10358-
helm.sh/chart: opentelemetry-collector-0.147.0
10365+
helm.sh/chart: opentelemetry-collector-0.147.1
1035910366
app.kubernetes.io/name: opentelemetry-collector
1036010367
app.kubernetes.io/instance: gateway-addons-helm
1036110368
app.kubernetes.io/version: "0.147.0"
@@ -10380,7 +10387,7 @@ metadata:
1038010387
app.kubernetes.io/name: prometheus
1038110388
app.kubernetes.io/instance: gateway-addons-helm
1038210389
app.kubernetes.io/version: v3.10.0
10383-
helm.sh/chart: prometheus-28.13.0
10390+
helm.sh/chart: prometheus-28.14.0
1038410391
app.kubernetes.io/part-of: prometheus
1038510392
name: prometheus
1038610393
subjects:
@@ -10502,7 +10509,7 @@ metadata:
1050210509
name: otel-collector
1050310510
namespace: monitoring
1050410511
labels:
10505-
helm.sh/chart: opentelemetry-collector-0.147.0
10512+
helm.sh/chart: opentelemetry-collector-0.147.1
1050610513
app.kubernetes.io/name: opentelemetry-collector
1050710514
app.kubernetes.io/instance: gateway-addons-helm
1050810515
app.kubernetes.io/version: "0.147.0"
@@ -10563,7 +10570,7 @@ metadata:
1056310570
app.kubernetes.io/name: prometheus
1056410571
app.kubernetes.io/instance: gateway-addons-helm
1056510572
app.kubernetes.io/version: v3.10.0
10566-
helm.sh/chart: prometheus-28.13.0
10573+
helm.sh/chart: prometheus-28.14.0
1056710574
app.kubernetes.io/part-of: prometheus
1056810575
name: prometheus
1056910576
namespace: monitoring
@@ -10725,7 +10732,7 @@ metadata:
1072510732
name: otel-collector
1072610733
namespace: monitoring
1072710734
labels:
10728-
helm.sh/chart: opentelemetry-collector-0.147.0
10735+
helm.sh/chart: opentelemetry-collector-0.147.1
1072910736
app.kubernetes.io/name: opentelemetry-collector
1073010737
app.kubernetes.io/instance: gateway-addons-helm
1073110738
app.kubernetes.io/version: "0.147.0"
@@ -10745,7 +10752,7 @@ spec:
1074510752
template:
1074610753
metadata:
1074710754
annotations:
10748-
checksum/config: 3578231efb501c9805a3b2e1af75f4d4d5afbf18c99906e4aaf9758d3b7f9ac5
10755+
checksum/config: 4308d6323756ee1d670efa46c6c68342f4ae98184afdd1b6bbe7cff8abb109fc
1074910756

1075010757
labels:
1075110758
app.kubernetes.io/name: opentelemetry-collector
@@ -10764,7 +10771,7 @@ spec:
1076410771
- --config=/conf/relay.yaml
1076510772
securityContext:
1076610773
{}
10767-
image: "otel/opentelemetry-collector-contrib:0.147.0"
10774+
image: "otel/opentelemetry-collector-contrib:0.148.0"
1076810775
imagePullPolicy: IfNotPresent
1076910776
ports:
1077010777

@@ -10798,6 +10805,29 @@ spec:
1079810805
fieldRef:
1079910806
apiVersion: v1
1080010807
fieldPath: status.podIP
10808+
- name: OTEL_K8S_NODE_NAME
10809+
valueFrom:
10810+
fieldRef:
10811+
fieldPath: spec.nodeName
10812+
- name: OTEL_K8S_NODE_IP
10813+
valueFrom:
10814+
fieldRef:
10815+
fieldPath: status.hostIP
10816+
- name: OTEL_K8S_NAMESPACE
10817+
valueFrom:
10818+
fieldRef:
10819+
apiVersion: v1
10820+
fieldPath: metadata.namespace
10821+
- name: OTEL_K8S_POD_NAME
10822+
valueFrom:
10823+
fieldRef:
10824+
apiVersion: v1
10825+
fieldPath: metadata.name
10826+
- name: OTEL_K8S_POD_IP
10827+
valueFrom:
10828+
fieldRef:
10829+
apiVersion: v1
10830+
fieldPath: status.podIP
1080110831
livenessProbe:
1080210832
httpGet:
1080310833
path: /
@@ -10828,7 +10858,7 @@ metadata:
1082810858
app.kubernetes.io/name: prometheus
1082910859
app.kubernetes.io/instance: gateway-addons-helm
1083010860
app.kubernetes.io/version: v3.10.0
10831-
helm.sh/chart: prometheus-28.13.0
10861+
helm.sh/chart: prometheus-28.14.0
1083210862
app.kubernetes.io/part-of: prometheus
1083310863
name: prometheus
1083410864
namespace: monitoring
@@ -10850,14 +10880,14 @@ spec:
1085010880
app.kubernetes.io/name: prometheus
1085110881
app.kubernetes.io/instance: gateway-addons-helm
1085210882
app.kubernetes.io/version: v3.10.0
10853-
helm.sh/chart: prometheus-28.13.0
10883+
helm.sh/chart: prometheus-28.14.0
1085410884
app.kubernetes.io/part-of: prometheus
1085510885
spec:
1085610886
enableServiceLinks: true
1085710887
serviceAccountName: prometheus
1085810888
containers:
1085910889
- name: prometheus-server-configmap-reload
10860-
image: "quay.io/prometheus-operator/prometheus-config-reloader:v0.89.0"
10890+
image: "quay.io/prometheus-operator/prometheus-config-reloader:v0.90.0"
1086110891
imagePullPolicy: "IfNotPresent"
1086210892
args:
1086310893
- --watched-dir=/etc/config

0 commit comments

Comments
 (0)