[kube-prometheus-stack] Implement Gateway API

Signed-off-by: Jan-Otto Kröpke <[email protected]>
prometheus-community · Aug 6, 2024 · 91d41d3 · 91d41d3
1 parent 9f9ccea
commit 91d41d3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/charts/kube-prometheus-stack/ci/03-non-defaults-values.yaml b/charts/kube-prometheus-stack/ci/03-non-defaults-values.yaml
@@ -28,7 +28,7 @@ alertmanager:
       logLevel: {{ print "debug" | quote }}
 
 prometheus:
-  gateway:
+  gatewayAPI:
     httpRoute:
       enabled: true
       annotations:

diff --git a/charts/kube-prometheus-stack/templates/prometheus/httproute.yaml b/charts/kube-prometheus-stack/templates/prometheus/httproute.yaml
@@ -1,9 +1,9 @@
-{{- if and .Values.prometheus.enabled .Values.prometheus.gateway.httpRoute.enabled -}}
+{{- if and .Values.prometheus.enabled .Values.prometheus.gatewayAPI.httpRoute.enabled -}}
   {{- $serviceName := printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "prometheus" -}}
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
-  {{- with .Values.prometheus.gateway.httpRoute.annotations }}
+  {{- with .Values.prometheus.gatewayAPI.httpRoute.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
@@ -12,27 +12,27 @@ metadata:
   labels:
     app: {{ template "kube-prometheus-stack.name" . }}-prometheus
     {{- include "kube-prometheus-stack.labels" . | nindent 4 }}
-    {{- with .Values.prometheus.gateway.httpRoute.labels }}
+    {{- with .Values.prometheus.gatewayAPI.httpRoute.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
-  {{- with .Values.prometheus.gateway.httpRoute.parentRefs }}
+  {{- with .Values.prometheus.gatewayAPI.httpRoute.parentRefs }}
   parentRefs:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .Values.prometheus.gateway.httpRoute.hostnames }}
+  {{- with .Values.prometheus.gatewayAPI.httpRoute.hostnames }}
   hostnames:
     {{- tpl (toYaml .) $ | nindent 4 }}
   {{- end }}
   rules:
     - backendRefs:
         - name: {{ $serviceName }}
           port: {{ .Values.prometheus.service.port }}
-      {{- with .Values.prometheus.gateway.httpRoute.filters }}
+      {{- with .Values.prometheus.gatewayAPI.httpRoute.filters }}
       filters:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.prometheus.gateway.httpRoute.matches }}
+      {{- with .Values.prometheus.gatewayAPI.httpRoute.matches }}
       matches:
         {{- toYaml . | nindent 8 }}
       {{- end }}

diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
@@ -3251,7 +3251,7 @@ prometheus:
       #   hosts:
       #     - prometheus.example.com
 
-  gateway:
+  gatewayAPI:
     httpRoute:
       enabled: false
       annotations: {}