apply reviewer's suggestion

Author: Frapschen

config/charts/inferencepool/templates/epp-deployment.yaml

@@ -62,7 +62,7 @@ spec:
         - "--{{ .name }}"
         - "{{ .value }}"
         {{- end }}
-        {{- if not .Values.inferenceExtension.serviceMonitor.auth.enabled }}
+        {{- if not .Values.inferenceExtension.monitoring.prometheus.enabled }}
         - --metrics-endpoint-auth=false
         {{- end }}
         ports:

config/charts/inferencepool/templates/epp-sa-token-secret.yaml

@@ -1,8 +1,8 @@
-{{- if and .Values.inferenceExtension.serviceMonitor.enabled .Values.inferenceExtension.serviceMonitor.auth.enabled (ne (lower .Values.provider.name) "gke") }}
+{{- if and .Values.inferenceExtension.monitoring.prometheus.enabled .Values.inferenceExtension.monitoring.prometheus.auth.enabled (ne (lower .Values.provider.name) "gke") }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Values.inferenceExtension.serviceMonitor.auth.secretName }}
+  name: {{ .Values.inferenceExtension.monitoring.prometheus.auth.secretName }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "gateway-api-inference-extension.labels" . | nindent 4 }}

config/charts/inferencepool/templates/epp-servicemonitor.yaml

@@ -1,24 +1,24 @@
-{{- if and .Values.inferenceExtension.serviceMonitor.enabled (ne (lower .Values.provider.name) "gke") }}
+{{- if and .Values.inferenceExtension.monitoring.prometheus.enabled (ne (lower .Values.provider.name) "gke") }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "gateway-api-inference-extension.name" . }}-monitor
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "gateway-api-inference-extension.labels" . | nindent 4 }}
-    {{- with .Values.inferenceExtension.serviceMonitor.extraLabels }}
+    {{- with .Values.inferenceExtension.monitoring.prometheus.extraLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
   endpoints:
-  - interval: {{ .Values.inferenceExtension.serviceMonitor.interval }}
+  - interval: {{ .Values.inferenceExtension.monitoring.prometheus.interval }}
     port: "http-metrics"
     path: "/metrics"
-    {{- if .Values.inferenceExtension.serviceMonitor.auth.enabled }}
+    {{- if .Values.inferenceExtension.monitoring.prometheus.auth.enabled }}
     authorization:
       credentials:
         key: token
-        name: {{ .Values.inferenceExtension.serviceMonitor.auth.secretName }}
+        name: {{ .Values.inferenceExtension.monitoring.prometheus.auth.secretName }}
     {{- end }}
   jobLabel: {{ include "gateway-api-inference-extension.name" . }}
   namespaceSelector:

config/charts/inferencepool/templates/gke.yaml

@@ -40,7 +40,7 @@ spec:
     logging:
       enabled: true    # log all requests by default
 ---
-{{- if and .Values.inferenceExtension.serviceMonitor.enabled .Values.inferenceExtension.serviceMonitor.auth.enabled }}
+{{- if and .Values.inferenceExtension.monitoring.prometheus.enabled .Values.inferenceExtension.monitoring.prometheus.auth.enabled }}
 {{- $metricsReadSA := printf "%s-metrics-reader-sa" .Release.Name -}}
 {{- $metricsReadSecretName := printf "%s-metrics-reader-secret" .Release.Name -}}
 {{- $metricsReadRoleName := printf "%s-%s-metrics-reader" .Release.Namespace .Release.Name -}}
@@ -83,7 +83,7 @@ spec:
   endpoints:
   - port: metrics
     scheme: http
-    interval: {{ .Values.inferenceExtension.serviceMonitor.interval }}
+    interval: {{ .Values.inferenceExtension.monitoring.prometheus.interval }}
     path: /metrics
     authorization:
       type: Bearer

config/charts/inferencepool/templates/rbac.yaml

@@ -17,7 +17,7 @@ rules:
   - subjectaccessreviews
   verbs:
   - create
-{{- if .Values.inferenceExtension.serviceMonitor.enabled }}
+{{- if .Values.inferenceExtension.monitoring.prometheus.enabled }}
 - nonResourceURLs:
   - "/metrics"
   verbs:

config/charts/inferencepool/values.yaml

@@ -40,16 +40,18 @@ inferenceExtension:
 
   tolerations: []
 
-  # Prometheus ServiceMonitor will be created when enabled for EPP metrics collection
-  serviceMonitor:
-    enabled: true
-    interval: "10s"
-    auth:
-      enabled: true
-      # Service account token secret for authentication
-      secretName: inference-gateway-sa-metrics-reader-secret
-    # additional labels for the ServiceMonitor
-    extraLabels: {}
+  # Monitoring configuration for EPP
+  monitoring:
+    # Prometheus ServiceMonitor will be created when enabled for EPP metrics collection
+    prometheus:
+      enabled: false
+      interval: "10s"
+      auth:
+        enabled: true
+        # Service account token secret for authentication
+        secretName: inference-gateway-sa-metrics-reader-secret
+      # additional labels for the ServiceMonitor
+      extraLabels: {}
 
 inferencePool:
   targetPorts: