follow-up: update docs and ci pipeline to utilize gateway-addons-helm (…

…envoyproxy#3610)

* update opentelemetry-collector version

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

* update makefile cmd to utilize gateway-addons-helm

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

* update docs according to gateway-addons-helm

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

* correct prometheus server name config

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

* fix e2e test labels

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

* correct grafana datasource url

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

* add template doc

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

* specify helm-generate

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

* remove tags

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

* fix gen-check

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

---------

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

charts/gateway-addons-helm/Chart.lock

@@ -16,6 +16,6 @@ dependencies:
   version: 1.3.1
 - name: opentelemetry-collector
   repository: https://open-telemetry.github.io/opentelemetry-helm-charts
-  version: 0.60.0
-digest: sha256:52aabfaf2c568f7b77da5cf5a771e936e052df2c66afdfd53a2c892452f06d6b
-generated: "2024-06-11T22:19:54.569241+08:00"
+  version: 0.73.1
+digest: sha256:4c16df8d7efc27aff566fa5dfd2eba6527adbf3fc8e94e7e3ccfc0cee7836f1c
+generated: "2024-06-20T11:46:59.148579+08:00"

charts/gateway-addons-helm/Chart.yaml

@@ -29,35 +29,23 @@ dependencies:
     version: 25.21.0
     repository: https://prometheus-community.github.io/helm-charts
     condition: prometheus.enabled
-    tags:
-      - metrics
   - name: grafana
     repository: https://grafana.github.io/helm-charts
     version: 8.0.0
     condition: grafana.enabled
-    tags:
-      - metrics
   - name: fluent-bit
     repository: https://fluent.github.io/helm-charts
     version: 0.30.4
     condition: fluent-bit.enabled
-    tags:
-      - logging
   - name: loki
     version: 4.8.0
     repository: https://grafana.github.io/helm-charts
     condition: loki.enabled
-    tags:
-      - logging
   - name: tempo
     repository: https://grafana.github.io/helm-charts
     version: 1.3.1
     condition: tempo.enabled
-    tags:
-      - tracing
   - name: opentelemetry-collector
     repository: https://open-telemetry.github.io/opentelemetry-helm-charts
-    version: 0.60.0
+    version: 0.73.1
     condition: opentelemetry-collector.enabled
-    tags:
-      - metrics

charts/gateway-addons-helm/README.md

@@ -25,7 +25,7 @@ An Add-ons Helm chart for Envoy Gateway
 | https://grafana.github.io/helm-charts | grafana | 8.0.0 |
 | https://grafana.github.io/helm-charts | loki | 4.8.0 |
 | https://grafana.github.io/helm-charts | tempo | 1.3.1 |
-| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.60.0 |
+| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.73.1 |
 | https://prometheus-community.github.io/helm-charts | prometheus | 25.21.0 |
 
 ## Usage
@@ -79,7 +79,7 @@ To uninstall the chart:
 | grafana.datasources."datasources.yaml".apiVersion | int | `1` |  |
 | grafana.datasources."datasources.yaml".datasources[0].name | string | `"Prometheus"` |  |
 | grafana.datasources."datasources.yaml".datasources[0].type | string | `"prometheus"` |  |
-| grafana.datasources."datasources.yaml".datasources[0].url | string | `"http://prometheus-server"` |  |
+| grafana.datasources."datasources.yaml".datasources[0].url | string | `"http://prometheus"` |  |
 | grafana.enabled | bool | `true` |  |
 | grafana.fullnameOverride | string | `"grafana"` |  |
 | grafana.service.type | string | `"LoadBalancer"` |  |
@@ -125,16 +125,13 @@ To uninstall the chart:
 | prometheus.kube-state-metrics.enabled | bool | `false` |  |
 | prometheus.prometheus-node-exporter.enabled | bool | `false` |  |
 | prometheus.prometheus-pushgateway.enabled | bool | `false` |  |
-| prometheus.server.fullnameOverride | string | `"prometheus-server"` |  |
+| prometheus.server.fullnameOverride | string | `"prometheus"` |  |
 | prometheus.server.global.scrape_interval | string | `"15s"` |  |
 | prometheus.server.image.repository | string | `"prom/prometheus"` |  |
 | prometheus.server.persistentVolume.enabled | bool | `false` |  |
 | prometheus.server.readinessProbeInitialDelay | int | `0` |  |
 | prometheus.server.securityContext | object | `{}` |  |
 | prometheus.server.service.type | string | `"LoadBalancer"` |  |
-| tags.logging | bool | `false` |  |
-| tags.metrics | bool | `true` |  |
-| tags.tracing | bool | `false` |  |
 | tempo.enabled | bool | `true` |  |
 | tempo.fullnameOverride | string | `"tempo"` |  |
 | tempo.service.type | string | `"LoadBalancer"` |  |

charts/gateway-addons-helm/values.yaml

@@ -1,9 +1,3 @@
-tags:
-  metrics: true
-  logging: false
-  tracing: false
-
-
 # Values for Grafana dependency
 grafana:
   enabled: true
@@ -14,7 +8,7 @@ grafana:
       datasources:
         - name: Prometheus
           type: prometheus
-          url: http://prometheus-server
+          url: http://prometheus
   adminPassword: admin
   service:
     type: LoadBalancer
@@ -47,7 +41,7 @@ prometheus:
   prometheus-node-exporter:
     enabled: false
   server:
-    fullnameOverride: prometheus-server
+    fullnameOverride: prometheus
     persistentVolume:
       enabled: false
     readinessProbeInitialDelay: 0