Skip to content

Commit c45f49d

Browse files
authored
clean up references to inference-extension (#1561)
* clean up references to inference-extension Signed-off-by: ahg-g <ahg@google.com> * Updated some variables to use epp prefix instead of router Signed-off-by: ahg-g <ahg@google.com> * fixed the helm verify error Signed-off-by: ahg-g <ahg@google.com> --------- Signed-off-by: ahg-g <ahg@google.com>
1 parent 6b41ecf commit c45f49d

17 files changed

Lines changed: 44 additions & 43 deletions

File tree

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{{ include "llm-d-router.validations.epp" $ }}
2+
{{ include "llm-d-router.inferencepool-resource" . }}
3+
{{ include "llm-d-epp.config" . }}
4+
{{ include "llm-d-epp.deployment" . }}
5+
{{ include "llm-d-epp.leader-election-rbac" . }}
6+
{{ include "llm-d-epp.sa-token-secret" . }}
7+
{{ include "llm-d-epp.service" . }}
8+
{{ include "llm-d-epp.service-monitor" . }}

config/charts/llm-d-router-gateway/templates/gke.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ spec:
5454
enabled: true # log all requests by default
5555
---
5656
{{- end }}
57-
{{- include "inference-extension.gke" . -}}
57+
{{- include "llm-d-router.gke" . -}}

config/charts/llm-d-router-gateway/templates/inferenceextension.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

config/charts/llm-d-router-gateway/templates/rbac.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ roleRef:
3030
kind: Role
3131
name: {{ printf "%s-non-sa" (include "llm-d-router.name" .) }}
3232
---
33-
{{- include "inference-extension.rbac" . -}}
33+
{{- include "llm-d-router.rbac" . -}}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{{ include "llm-d-router.validations.epp" $ }}
2+
{{ include "llm-d-router.validations.standalone" . }}
3+
{{ include "llm-d-epp.config" . }}
4+
{{ include "llm-d-epp.deployment" . }}
5+
{{ include "llm-d-router.gke" . }}
6+
{{ include "llm-d-epp.leader-election-rbac" . }}
7+
{{ include "llm-d-epp.sa-token-secret" . }}
8+
{{ include "llm-d-epp.service" . }}
9+
{{ include "llm-d-epp.service-monitor" . }}
10+
{{ include "llm-d-router.rbac" . }}
11+
{{ include "llm-d-router.inferencepool-resource" . }}

config/charts/llm-d-router-standalone/templates/inferenceextension.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

config/charts/routerlib/templates/_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- define "inference-extension.config" -}}
1+
{{- define "llm-d-epp.config" -}}
22
apiVersion: v1
33
kind: ConfigMap
44
metadata:

config/charts/routerlib/templates/_deployment.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- define "inference-extension.deployment" -}}
1+
{{- define "llm-d-epp.deployment" -}}
22
apiVersion: apps/v1
33
kind: Deployment
44
metadata:
@@ -30,9 +30,9 @@ spec:
3030
{{- $proxyType := include "llm-d-router.proxyType" . | trim }}
3131
{{- $proxyConfigMap := index $proxy "configMap" | default dict }}
3232
{{- $proxyConfigMapName := index $proxyConfigMap "name" | default "" }}
33-
{{- $inferenceExtensionFlags := deepCopy (.Values.router.epp.flags | default dict) }}
34-
{{- if and (eq $proxyType "agentgateway") (not (hasKey $inferenceExtensionFlags "secure-serving")) }}
35-
{{- $_ := set $inferenceExtensionFlags "secure-serving" false }}
33+
{{- $eppFlags := deepCopy (.Values.router.epp.flags | default dict) }}
34+
{{- if and (eq $proxyType "agentgateway") (not (hasKey $eppFlags "secure-serving")) }}
35+
{{- $_ := set $eppFlags "secure-serving" false }}
3636
{{- end }}
3737
serviceAccountName: {{ include "llm-d-router.name" . }}
3838
# Conservatively, this timeout should mirror the longest grace period of the pods within the pool
@@ -130,9 +130,9 @@ spec:
130130
{{- if gt (.Values.router.epp.replicas | int) 1 }}
131131
- --ha-enable-leader-election
132132
{{- end }}
133-
# Pass additional flags via the inferenceExtension.flags field in values.yaml.
133+
# Pass additional flags via the router.epp.flags field in values.yaml.
134134
# Render them as --flag=value so boolean values are parsed correctly.
135-
{{- range $key, $value := $inferenceExtensionFlags }}
135+
{{- range $key, $value := $eppFlags }}
136136
- {{ printf "--%s=%v" $key $value | quote }}
137137
{{- end }}
138138
{{- if .Values.router.tracing.enabled }}

config/charts/routerlib/templates/_gke.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- define "inference-extension.gke" -}}
1+
{{- define "llm-d-router.gke" -}}
22
{{- $monitoringProvider := include "llm-d-router.monitoring.provider" . | fromYaml | default dict -}}
33
{{- if and $monitoringProvider (eq (lower (index $monitoringProvider "name" | default "")) "gmp") }}
44
{{- if and .Values.router.monitoring.prometheus.enabled .Values.router.monitoring.prometheus.auth.enabled }}

config/charts/routerlib/templates/_helpers.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
99
{{- end }}
1010

1111
{{/*
12-
Inference extension name
12+
Router deployment name
1313
*/}}
1414
{{- define "llm-d-router.name" -}}
1515
{{- $base := .Release.Name | default "default-pool" | lower | trim | trunc 40 -}}
@@ -52,7 +52,7 @@ llm-d.ai/igw-mode: llm-d-router-gateway
5252
{{/*
5353
Return the monitoring provider name.
5454
55-
If inferenceExtension.monitoring.provider.name is unset/empty, default to
55+
If router.monitoring.provider.name is unset/empty, default to
5656
prometheusoperator. For backwards compatibility, provider.name=gke still maps
5757
to gmp when no monitoring provider is explicitly set.
5858
*/}}
@@ -74,7 +74,7 @@ prometheusoperator
7474
{{/*
7575
Return the monitoring provider config object.
7676
77-
When inferenceExtension.monitoring.provider.name is unset/empty, use defaults.
77+
When router.monitoring.provider.name is unset/empty, use defaults.
7878
For backwards compatibility, provider.gke.autopilot is still honored when
7979
provider.name=gke and no monitoring provider is explicitly set.
8080
*/}}

0 commit comments

Comments
 (0)