fix(helm): refactor monitoring service (#2704)

fix: refactor monitoring service Signed-off-by: nipsufn <nipsufn+gh@pm.me>
envoyproxy · Mar 2, 2024 · 74f86f9 · 74f86f9
1 parent 2a63f91
commit 74f86f9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/charts/gateway-helm/templates/envoy-gateway-deployment.yaml b/charts/gateway-helm/templates/envoy-gateway-deployment.yaml
@@ -58,6 +58,13 @@ spec:
           initialDelaySeconds: 15
           periodSeconds: 20
         name: envoy-gateway
+        ports:
+        {{- range .Values.deployment.ports }}
+        - containerPort: {{ .port }}
+          name: {{ .name }}
+        {{- end}}
+        - containerPort: 19001
+          name: http-metrics
         readinessProbe:
           httpGet:
             path: /readyz

diff --git a/charts/gateway-helm/templates/envoy-gateway-metrics-service.yaml b/charts/gateway-helm/templates/envoy-gateway-metrics-service.yaml
@@ -1,6 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
+  annotations:
+    prometheus.io/scrape: 'true'
+    prometheus.io/port: '19001'
   name: envoy-gateway-metrics-service
   namespace: '{{ .Release.Namespace }}'
   labels:
@@ -11,4 +14,7 @@ spec:
     control-plane: envoy-gateway
   {{- include "eg.selectorLabels" . | nindent 4 }}
   ports:
-	{{- .Values.envoyGatewayMetricsService.ports | toYaml | nindent 2 -}}
+  - name: http
+    port: {{ .Values.envoyGatewayMetricsService.port }}
+    protocol: TCP
+    targetPort: http-metrics
diff --git a/charts/gateway-helm/values.tmpl.yaml b/charts/gateway-helm/values.tmpl.yaml
@@ -36,11 +36,7 @@ config:
         default: info
 
 envoyGatewayMetricsService:
-  ports:
-    - name: http
-      port: 19001
-      protocol: TCP
-      targetPort: 19001
+  port: 19001
 
 createNamespace: false
 

diff --git a/site/content/en/latest/install/api.md b/site/content/en/latest/install/api.md
@@ -51,9 +51,6 @@ The Helm chart for Envoy Gateway
 | deployment.ports[1].port | int | `18001` |  |
 | deployment.ports[1].targetPort | int | `18001` |  |
 | deployment.replicas | int | `1` |  |
-| envoyGatewayMetricsService.ports[0].name | string | `"http"` |  |
-| envoyGatewayMetricsService.ports[0].port | int | `19001` |  |
-| envoyGatewayMetricsService.ports[0].protocol | string | `"TCP"` |  |
-| envoyGatewayMetricsService.ports[0].targetPort | int | `19001` |  |
+| envoyGatewayMetricsService.port | int | `19001` |  |
 | kubernetesClusterDomain | string | `"cluster.local"` |  |