update chart

Author: Frapschen

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

@@ -62,6 +62,9 @@ spec:
         - "--{{ .name }}"
         - "{{ .value }}"
         {{- end }}
+        {{- if not .Values.inferenceExtension.serviceMonitor.auth.enabled }}
+        - --metrics-endpoint-auth=false
+        {{- end }}
         ports:
         - name: grpc
           containerPort: 9002

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

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

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

@@ -1,20 +1,25 @@
-{{- if .Values.inferenceExtension.monitoring.prometheus.enabled }}
+{{- if and .Values.inferenceExtension.serviceMonitor.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 }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   endpoints:
-  - interval: {{ .Values.inferenceExtension.monitoring.interval }}
+  - interval: {{ .Values.inferenceExtension.serviceMonitor.interval }}
     port: "http-metrics"
     path: "/metrics"
+    {{- if .Values.inferenceExtension.serviceMonitor.auth.enabled }}
     authorization:
       credentials:
         key: token
-        name: {{ .Values.inferenceExtension.monitoring.secret.name }}
+        name: {{ .Values.inferenceExtension.serviceMonitor.auth.secretName }}
+    {{- end }}
   jobLabel: {{ include "gateway-api-inference-extension.name" . }}
   namespaceSelector:
     matchNames:

config/charts/inferencepool/templates/gke.yaml

@@ -40,7 +40,7 @@ spec:
     logging:
       enabled: true    # log all requests by default
 ---
-{{- if .Values.inferenceExtension.monitoring.gke.enabled }}
+{{- if and .Values.inferenceExtension.serviceMonitor.enabled .Values.inferenceExtension.serviceMonitor.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.monitoring.interval }}
+    interval: {{ .Values.inferenceExtension.serviceMonitor.interval }}
     path: /metrics
     authorization:
       type: Bearer

config/charts/inferencepool/templates/rbac.yaml

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

config/charts/inferencepool/values.yaml

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