refactor: collapse eg-metrics-svc into eg-svc

Signed-off-by: ShyunnY <1147212064@qq.com>
envoyproxy · Mar 15, 2024 · 5b4367f · 5b4367f
1 parent 36505f4
commit 5b4367f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 25 deletions.
diff --git a/charts/gateway-helm/templates/_helpers.tpl b/charts/gateway-helm/templates/_helpers.tpl
@@ -60,3 +60,11 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+eg metrics annotations
+*/}}
+{{- define "eg.metrics.annotation" -}}
+prometheus.io/scrape: 'true'
+prometheus.io/port: '19001'
+{{- end }}
diff --git a/charts/gateway-helm/templates/envoy-gateway-deployment.yaml b/charts/gateway-helm/templates/envoy-gateway-deployment.yaml
@@ -63,8 +63,6 @@ spec:
         - 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
diff --git a/charts/gateway-helm/templates/envoy-gateway-service.yaml b/charts/gateway-helm/templates/envoy-gateway-service.yaml
@@ -6,6 +6,8 @@ metadata:
   labels:
     control-plane: envoy-gateway
   {{- include "eg.labels" . | nindent 4 }}
+  annotations:
+  {{- include "eg.metrics.annotation" . | nindent 4}}
 spec:
   selector:
     control-plane: envoy-gateway

diff --git a/charts/gateway-helm/values.tmpl.yaml b/charts/gateway-helm/values.tmpl.yaml
@@ -19,6 +19,9 @@ deployment:
     - name: ratelimit
       port: 18001
       targetPort: 18001
+    - name: metrics
+      port: 19001
+      targetPort: 19001
   replicas: 1
   pod:
     affinity: {}
@@ -35,9 +38,6 @@ config:
       level:
         default: info
 
-envoyGatewayMetricsService:
-  port: 19001
-
 createNamespace: false
 
 kubernetesClusterDomain: cluster.local