Support agentgateway standalone sidecar (kubernetes-sigs#2905)

* Support agentgateway standalone sidecar

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>

* Update standalone agentgateway chart tests

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>

---------

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>

Author: danehans

config/charts/epplib/templates/_helpers.tpl

@@ -150,13 +150,23 @@ Return the standalone EPP model-server target ports.
 {{- end -}}
 
 {{/*
-Return the agentgateway model Service ports.
+Return the agentgateway logical model backend name.
 */}}
-{{- define "gateway-api-inference-extension.agentgateway.modelServicePorts" -}}
-{{- $sidecarValues := .Values.inferenceExtension.sidecar | default dict -}}
-{{- $agentgateway := index $sidecarValues "agentgateway" | default dict -}}
-{{- $service := index $agentgateway "service" | default dict -}}
-{{- include "gateway-api-inference-extension.normalizedPortList" (dict "path" ".Values.inferenceExtension.sidecar.agentgateway.service.ports" "value" (index $service "ports")) -}}
+{{- define "gateway-api-inference-extension.agentgateway.logicalBackendName" -}}
+{{- $selector := .Values.inferenceExtension.endpointsServer.endpointSelector | default "" -}}
+{{- $appName := "" -}}
+{{- range $raw := splitList "," $selector -}}
+  {{- $part := trim $raw -}}
+  {{- $kv := splitList "=" $part -}}
+  {{- if and (eq (len $kv) 2) (eq (trim (index $kv 0)) "app") -}}
+    {{- $appName = trim (index $kv 1) -}}
+  {{- end -}}
+{{- end -}}
+{{- if not (empty $appName) -}}
+  {{- $appName -}}
+{{- else -}}
+  {{- .Release.Name -}}
+{{- end -}}
 {{- end -}}
 
 {{/*
@@ -201,40 +211,13 @@ Return the rendered sidecar ConfigMap data.
 {{- toYaml $data -}}
 {{- end -}}
 
-{{/*
-Render labels from the standalone endpoint selector for the generated model Service.
-Only equality-based selectors are supported because Service selectors are a map.
-*/}}
-{{- define "gateway-api-inference-extension.agentgateway.modelServiceSelectorLabels" -}}
-{{- $selector := .Values.inferenceExtension.endpointsServer.endpointSelector | default "" -}}
-{{- if empty $selector -}}
-  {{- fail ".Values.inferenceExtension.endpointsServer.endpointSelector is required when creating an agentgateway model Service" -}}
-{{- end -}}
-{{- range $raw := splitList "," $selector }}
-  {{- $part := trim $raw -}}
-  {{- $kv := splitList "=" $part -}}
-  {{- if ne (len $kv) 2 -}}
-    {{- fail (printf ".Values.inferenceExtension.endpointsServer.endpointSelector must use comma-separated key=value labels when creating an agentgateway model Service, got %q" $selector) -}}
-  {{- end -}}
-  {{- $key := trim (index $kv 0) -}}
-  {{- $value := trim (index $kv 1) -}}
-  {{- if or (empty $key) (empty $value) -}}
-    {{- fail (printf ".Values.inferenceExtension.endpointsServer.endpointSelector must use non-empty key=value labels when creating an agentgateway model Service, got %q" $selector) -}}
-  {{- end -}}
-{{- printf "%s: %s\n" ($key | quote) ($value | quote) -}}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Render the default standalone agentgateway sidecar config template.
 */}}
 {{- define "gateway-api-inference-extension.sidecar.agentgatewayConfig" -}}
-{{- $sidecarValues := .Values.inferenceExtension.sidecar | default dict -}}
-{{- $agentgateway := index $sidecarValues "agentgateway" | default dict -}}
-{{- $service := index $agentgateway "service" | default dict -}}
-{{- $serviceName := index $service "name" | default "" -}}
-{{- $serviceNamespace := index $service "namespace" | default .Release.Namespace -}}
-{{- $servicePorts := splitList "," (include "gateway-api-inference-extension.agentgateway.modelServicePorts" .) -}}
+{{- $serviceName := include "gateway-api-inference-extension.agentgateway.logicalBackendName" . -}}
+{{- $serviceNamespace := .Release.Namespace -}}
+{{- $servicePorts := splitList "," (include "gateway-api-inference-extension.standaloneEndpointTargetPorts" .) -}}
 {{- $backendPort := index $servicePorts 0 -}}
 {{- $listenerPort := include "gateway-api-inference-extension.standaloneProxyListenerPort" . | int -}}
 config:

config/charts/standalone/templates/_validations.tpl

@@ -19,33 +19,19 @@ standalone validations
   {{- if not (or (eq $proxyType "envoy") (eq $proxyType "agentgateway")) -}}
     {{- fail (printf ".Values.inferenceExtension.sidecar.proxyType must be one of [envoy, agentgateway], got %q" $proxyType) -}}
   {{- end -}}
-  {{- if eq $proxyType "agentgateway" -}}
+    {{- if eq $proxyType "agentgateway" -}}
     {{- if and .Values.inferenceExtension.endpointsServer .Values.inferenceExtension.endpointsServer.createInferencePool -}}
-      {{- fail ".Values.inferenceExtension.endpointsServer.createInferencePool=false is required when proxyType=agentgateway; standalone agentgateway currently supports only service-backed routing" -}}
+      {{- fail ".Values.inferenceExtension.endpointsServer.createInferencePool=false is required when proxyType=agentgateway; standalone agentgateway uses EPP endpoint discovery with a logical service backend" -}}
     {{- end -}}
-    {{- $agentgateway := index $sidecar "agentgateway" | default dict -}}
-    {{- $service := index $agentgateway "service" | default dict -}}
-    {{- $serviceName := index $service "name" | default "" -}}
-    {{- $serviceCreate := index $service "create" | default true -}}
-    {{- if hasKey $service "port" -}}
-      {{- fail ".Values.inferenceExtension.sidecar.agentgateway.service.port has been replaced by .Values.inferenceExtension.sidecar.agentgateway.service.ports" -}}
+    {{- if hasKey $sidecar "agentgateway" -}}
+      {{- fail ".Values.inferenceExtension.sidecar.agentgateway is no longer supported; standalone agentgateway derives its logical backend from endpointsServer settings" -}}
     {{- end -}}
-    {{- if empty $serviceName -}}
-      {{- fail ".Values.inferenceExtension.sidecar.agentgateway.service.name is required when proxyType=agentgateway" -}}
-    {{- end -}}
-    {{- $targetPorts := include "gateway-api-inference-extension.standaloneEndpointTargetPorts" . -}}
-    {{- $servicePorts := include "gateway-api-inference-extension.agentgateway.modelServicePorts" . -}}
-    {{- if ne $targetPorts $servicePorts -}}
-      {{- fail (printf ".Values.inferenceExtension.sidecar.agentgateway.service.ports must match .Values.inferenceExtension.endpointsServer.targetPorts when proxyType=agentgateway, got service ports %q and target ports %q" $servicePorts $targetPorts) -}}
-    {{- end -}}
-    {{- $listenerPort := include "gateway-api-inference-extension.standaloneProxyListenerPort" . -}}
+    {{- $_ := include "gateway-api-inference-extension.standaloneEndpointTargetPorts" . -}}
+    {{- $_ := include "gateway-api-inference-extension.standaloneProxyListenerPort" . -}}
     {{- $flags := .Values.inferenceExtension.flags | default dict -}}
     {{- if and (hasKey $flags "secure-serving") (ne (toString (index $flags "secure-serving")) "false") -}}
       {{- fail ".Values.inferenceExtension.flags.secure-serving must be false when proxyType=agentgateway; standalone agentgateway uses plaintext gRPC to EPP over localhost" -}}
     {{- end -}}
-    {{- if $serviceCreate -}}
-      {{- $selectorLabels := include "gateway-api-inference-extension.agentgateway.modelServiceSelectorLabels" . -}}
-    {{- end -}}
   {{- end -}}
 {{- end -}}
 {{- end -}}

config/charts/standalone/templates/agentgateway-service.yaml

@@ -30,17 +30,6 @@ inferenceExtension:
     enabled: true
     proxyType: envoy
 
-    # Agentgateway-specific settings used by the built-in preset when
-    # proxyType=agentgateway. service.name is required.
-    agentgateway:
-      service:
-        create: true
-        name: ""
-        namespace: ""
-        # Must match inferenceExtension.endpointsServer.targetPorts.
-        ports:
-          - 8000
-
     # Built-in standalone proxy presets. The selected preset is merged with the
     # top-level sidecar.* fields below, so explicit user overrides still win.
     presets:

config/charts/standalone/values.yaml

@@ -97,7 +97,7 @@ test_cases_standalone["basic"]="--set inferenceExtension.endpointsServer.endpoin
 test_cases_standalone["gke-provider"]="--set provider.name=gke --set inferenceExtension.endpointsServer.endpointSelector='app=llm-instance-gateway' --set inferenceExtension.endpointsServer.createInferencePool=false"
 test_cases_standalone["latency-predictor"]="--set inferenceExtension.latencyPredictor.enabled=true --set inferenceExtension.endpointsServer.endpointSelector='app=llm-instance-gateway' --set inferenceExtension.endpointsServer.createInferencePool=false"
 test_cases_standalone["inferencepool"]="--set inferenceExtension.endpointsServer.createInferencePool=true --set inferencePool.modelServers.matchLabels.app=llm-instance-gateway"
-test_cases_standalone["agentgateway"]="--set inferenceExtension.sidecar.proxyType=agentgateway --set inferenceExtension.sidecar.agentgateway.service.name=llm-instance-gateway --set 'inferenceExtension.sidecar.agentgateway.service.ports[0]=8000' --set inferenceExtension.endpointsServer.endpointSelector='app=llm-instance-gateway' --set inferenceExtension.endpointsServer.createInferencePool=false --set 'inferenceExtension.endpointsServer.targetPorts[0]=8000'"
+test_cases_standalone["agentgateway"]="--set inferenceExtension.sidecar.proxyType=agentgateway --set inferenceExtension.endpointsServer.endpointSelector='app=llm-instance-gateway' --set inferenceExtension.endpointsServer.createInferencePool=false"
 
 
 echo "Processing dependencies for standalone chart..."
@@ -136,42 +136,21 @@ if eval "${invalid_proxy_command}"; then
   exit 1
 fi
 
-missing_agentgateway_service_command="${SCRIPT_ROOT}/bin/helm template ${SCRIPT_ROOT}/config/charts/standalone --set inferenceExtension.endpointsServer.endpointSelector='app=llm-instance-gateway' --set inferenceExtension.endpointsServer.createInferencePool=false --set inferenceExtension.sidecar.proxyType=agentgateway >/dev/null"
-echo "Executing: ${missing_agentgateway_service_command}"
-if eval "${missing_agentgateway_service_command}"; then
-  echo "Helm template unexpectedly succeeded for missing agentgateway service.name"
-  exit 1
-fi
-
-unsupported_agentgateway_inferencepool_command="${SCRIPT_ROOT}/bin/helm template ${SCRIPT_ROOT}/config/charts/standalone --set inferenceExtension.sidecar.proxyType=agentgateway --set inferenceExtension.sidecar.agentgateway.service.name=llm-instance-gateway --set 'inferenceExtension.sidecar.agentgateway.service.ports[0]=8000' --set inferenceExtension.endpointsServer.createInferencePool=true --set inferencePool.modelServers.matchLabels.app=llm-instance-gateway >/dev/null"
+unsupported_agentgateway_inferencepool_command="${SCRIPT_ROOT}/bin/helm template ${SCRIPT_ROOT}/config/charts/standalone --set inferenceExtension.sidecar.proxyType=agentgateway --set inferenceExtension.endpointsServer.createInferencePool=true --set inferencePool.modelServers.matchLabels.app=llm-instance-gateway >/dev/null"
 echo "Executing: ${unsupported_agentgateway_inferencepool_command}"
 if eval "${unsupported_agentgateway_inferencepool_command}"; then
   echo "Helm template unexpectedly succeeded for unsupported agentgateway createInferencePool=true configuration"
   exit 1
 fi
 
-unsupported_agentgateway_selector_command="${SCRIPT_ROOT}/bin/helm template ${SCRIPT_ROOT}/config/charts/standalone --set inferenceExtension.sidecar.proxyType=agentgateway --set inferenceExtension.sidecar.agentgateway.service.name=llm-instance-gateway --set 'inferenceExtension.sidecar.agentgateway.service.ports[0]=8000' --set inferenceExtension.endpointsServer.endpointSelector='app in (llm-instance-gateway)' --set inferenceExtension.endpointsServer.createInferencePool=false --set 'inferenceExtension.endpointsServer.targetPorts[0]=8000' >/dev/null"
-echo "Executing: ${unsupported_agentgateway_selector_command}"
-if eval "${unsupported_agentgateway_selector_command}"; then
-  echo "Helm template unexpectedly succeeded for unsupported agentgateway model Service selector"
-  exit 1
-fi
-
-mismatched_agentgateway_ports_command="${SCRIPT_ROOT}/bin/helm template ${SCRIPT_ROOT}/config/charts/standalone --set inferenceExtension.sidecar.proxyType=agentgateway --set inferenceExtension.sidecar.agentgateway.service.name=llm-instance-gateway --set 'inferenceExtension.sidecar.agentgateway.service.ports[0]=8001' --set inferenceExtension.endpointsServer.endpointSelector='app=llm-instance-gateway' --set inferenceExtension.endpointsServer.createInferencePool=false --set 'inferenceExtension.endpointsServer.targetPorts[0]=8000' >/dev/null"
-echo "Executing: ${mismatched_agentgateway_ports_command}"
-if eval "${mismatched_agentgateway_ports_command}"; then
-  echo "Helm template unexpectedly succeeded for mismatched agentgateway service.ports"
-  exit 1
-fi
-
-unsupported_agentgateway_listener_port_command="${SCRIPT_ROOT}/bin/helm template ${SCRIPT_ROOT}/config/charts/standalone --set inferenceExtension.sidecar.proxyType=agentgateway --set inferenceExtension.sidecar.agentgateway.service.name=llm-instance-gateway --set 'inferenceExtension.sidecar.agentgateway.service.ports[0]=8000' --set inferenceExtension.endpointsServer.endpointSelector='app=llm-instance-gateway' --set inferenceExtension.endpointsServer.createInferencePool=false --set 'inferenceExtension.endpointsServer.targetPorts[0]=8000' --set 'inferenceExtension.extraServicePorts[0].name=proxy' --set 'inferenceExtension.extraServicePorts[0].port=9000' --set 'inferenceExtension.extraServicePorts[0].protocol=TCP' --set 'inferenceExtension.extraServicePorts[0].targetPort=9000' >/dev/null"
+unsupported_agentgateway_listener_port_command="${SCRIPT_ROOT}/bin/helm template ${SCRIPT_ROOT}/config/charts/standalone --set inferenceExtension.sidecar.proxyType=agentgateway --set inferenceExtension.endpointsServer.endpointSelector='app=llm-instance-gateway' --set inferenceExtension.endpointsServer.createInferencePool=false --set 'inferenceExtension.extraServicePorts[0].name=proxy' --set 'inferenceExtension.extraServicePorts[0].port=9000' --set 'inferenceExtension.extraServicePorts[0].protocol=TCP' --set 'inferenceExtension.extraServicePorts[0].targetPort=9000' >/dev/null"
 echo "Executing: ${unsupported_agentgateway_listener_port_command}"
 if eval "${unsupported_agentgateway_listener_port_command}"; then
   echo "Helm template unexpectedly succeeded without an agentgateway listener Service port named http"
   exit 1
 fi
 
-mismatched_agentgateway_listener_target_port_command="${SCRIPT_ROOT}/bin/helm template ${SCRIPT_ROOT}/config/charts/standalone --set inferenceExtension.sidecar.proxyType=agentgateway --set inferenceExtension.sidecar.agentgateway.service.name=llm-instance-gateway --set 'inferenceExtension.sidecar.agentgateway.service.ports[0]=8000' --set inferenceExtension.endpointsServer.endpointSelector='app=llm-instance-gateway' --set inferenceExtension.endpointsServer.createInferencePool=false --set 'inferenceExtension.endpointsServer.targetPorts[0]=8000' --set 'inferenceExtension.extraServicePorts[0].name=http' --set 'inferenceExtension.extraServicePorts[0].port=9000' --set 'inferenceExtension.extraServicePorts[0].protocol=TCP' --set 'inferenceExtension.extraServicePorts[0].targetPort=9001' >/dev/null"
+mismatched_agentgateway_listener_target_port_command="${SCRIPT_ROOT}/bin/helm template ${SCRIPT_ROOT}/config/charts/standalone --set inferenceExtension.sidecar.proxyType=agentgateway --set inferenceExtension.endpointsServer.endpointSelector='app=llm-instance-gateway' --set inferenceExtension.endpointsServer.createInferencePool=false --set 'inferenceExtension.extraServicePorts[0].name=http' --set 'inferenceExtension.extraServicePorts[0].port=9000' --set 'inferenceExtension.extraServicePorts[0].protocol=TCP' --set 'inferenceExtension.extraServicePorts[0].targetPort=9001' >/dev/null"
 echo "Executing: ${mismatched_agentgateway_listener_target_port_command}"
 if eval "${mismatched_agentgateway_listener_target_port_command}"; then
   echo "Helm template unexpectedly succeeded for an agentgateway listener targetPort that does not match port"
@@ -190,7 +169,7 @@ fi
 
 echo "Verifying standalone agentgateway renders plaintext EPP and custom listener ports..."
 agentgateway_render_output="${TEMP_DIR}/standalone-agentgateway-render.yaml"
-agentgateway_render_command="${SCRIPT_ROOT}/bin/helm template ${SCRIPT_ROOT}/config/charts/standalone --set inferenceExtension.sidecar.proxyType=agentgateway --set inferenceExtension.sidecar.agentgateway.service.name=llm-instance-gateway --set 'inferenceExtension.sidecar.agentgateway.service.ports[0]=8000' --set inferenceExtension.endpointsServer.endpointSelector='app=llm-instance-gateway' --set inferenceExtension.endpointsServer.createInferencePool=false --set 'inferenceExtension.endpointsServer.targetPorts[0]=8000' --set 'inferenceExtension.extraServicePorts[0].name=http' --set 'inferenceExtension.extraServicePorts[0].port=9000' --set 'inferenceExtension.extraServicePorts[0].protocol=TCP' --set 'inferenceExtension.extraServicePorts[0].targetPort=http' > ${agentgateway_render_output}"
+agentgateway_render_command="${SCRIPT_ROOT}/bin/helm template ${SCRIPT_ROOT}/config/charts/standalone --set inferenceExtension.sidecar.proxyType=agentgateway --set inferenceExtension.endpointsServer.endpointSelector='app=llm-instance-gateway' --set inferenceExtension.endpointsServer.createInferencePool=false --set 'inferenceExtension.extraServicePorts[0].name=http' --set 'inferenceExtension.extraServicePorts[0].port=9000' --set 'inferenceExtension.extraServicePorts[0].protocol=TCP' --set 'inferenceExtension.extraServicePorts[0].targetPort=http' > ${agentgateway_render_output}"
 echo "Executing: ${agentgateway_render_command}"
 eval "${agentgateway_render_command}"
 if ! grep -q -- '--secure-serving=false' "${agentgateway_render_output}"; then
@@ -213,14 +192,19 @@ if ! grep -q -- 'destinationMode: passthrough' "${agentgateway_render_output}";
   echo "Agentgateway Helm template did not render passthrough destination mode"
   exit 1
 fi
-
-agentgateway_service_block="${TEMP_DIR}/standalone-agentgateway-service.yaml"
-sed -n '/^# Source: standalone\/templates\/agentgateway-service.yaml/,/^---/p' "${agentgateway_render_output}" > "${agentgateway_service_block}"
-if ! grep -q -- 'app.kubernetes.io/component: agentgateway-model-service' "${agentgateway_service_block}"; then
-  echo "Agentgateway model Service did not render its component label"
+if ! grep -q -- 'name: "default/llm-instance-gateway"' "${agentgateway_render_output}"; then
+  echo "Agentgateway Helm template did not derive the logical backend name from endpointSelector"
+  exit 1
+fi
+if ! grep -q -- 'hostname: "llm-instance-gateway"' "${agentgateway_render_output}"; then
+  echo "Agentgateway Helm template did not derive the logical backend hostname from endpointSelector"
+  exit 1
+fi
+if grep -q -- 'standalone/templates/agentgateway-service.yaml' "${agentgateway_render_output}"; then
+  echo "Agentgateway Helm template unexpectedly rendered a model Service"
   exit 1
 fi
-if grep -q -- 'app.kubernetes.io/name:' "${agentgateway_service_block}"; then
-  echo "Agentgateway model Service rendered an app.kubernetes.io/name label"
+if grep -q -- 'agentgateway-model-service' "${agentgateway_render_output}"; then
+  echo "Agentgateway Helm template unexpectedly rendered model Service labels"
   exit 1
 fi