Skip to content
This repository was archived by the owner on Jun 20, 2026. It is now read-only.

Commit ffea528

Browse files
danehansdanehans
committed
Remove legacy kgateway GatewayParameters
Drop the old GatewayParameters template and route both kgateway and agentgateway through AgentgatewayParameters. Keep deprecated gatewayClassName aliases mapped to agentgateway. Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
1 parent 27075a0 commit ffea528

8 files changed

Lines changed: 13 additions & 101 deletions

File tree

‎charts/llm-d-infra/README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Kubernetes: `>= 1.28.0-0`
106106
| extraDeploy | Array of extra objects to deploy with the release | list | `[]` |
107107
| fullnameOverride | String to fully override common.names.fullname | string | `""` |
108108
| gateway | Gateway configuration | object | See below |
109-
| gateway.agentgateway | Agentgateway-specific parameters rendered into AgentgatewayParameters when gateway.provider resolves to "agentgateway", or when "kgateway" resolves to the "agentgateway" GatewayClass | object | `{"env":[],"istio":{},"rawConfig":{},"shutdown":{}}` |
109+
| gateway.agentgateway | Agentgateway-specific parameters rendered into AgentgatewayParameters when gateway.provider resolves to "kgateway" or "agentgateway" | object | `{"env":[],"istio":{},"rawConfig":{},"shutdown":{}}` |
110110
| gateway.agentgateway.env | Additional environment variables for the agentgateway proxy | list | `[]` |
111111
| gateway.agentgateway.istio | Optional Istio integration settings for the agentgateway proxy | object | `{}` |
112112
| gateway.agentgateway.rawConfig | Raw agentgateway config merged into the generated configuration | object | `{}` |
@@ -115,8 +115,7 @@ Kubernetes: `>= 1.28.0-0`
115115
| gateway.destinationRule | see: https://istio.io/latest/docs/reference/config/networking/destination-rule/ | object | `{"enabled":false,"exportTo":[],"host":"localhost","subsets":[],"trafficPolicy":{},"workloadSelector":{}}` |
116116
| gateway.enabled | Deploy resources related to Gateway | bool | `true` |
117117
| gateway.fullnameOverride | String to fully override gateway.fullname | string | `""` |
118-
| gateway.gatewayClassName | Deprecated: "agentgateway-v2" is mapped to "agentgateway". | string | `""` |
119-
| gateway.gatewayParameters.floatingUserId | Only used when gateway.provider resolves to "kgateway" and gateway.gatewayClassName resolves to "kgateway" When true, allows OpenShift to assign user IDs from its allowed range instead of using a hardcoded user ID | bool | `false` |
118+
| gateway.gatewayClassName | Deprecated: "kgateway" and "agentgateway-v2" are mapped to "agentgateway". | string | `""` |
120119
| gateway.gatewayParameters.resources | Resource requests/limits <br /> Ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#resource-requests-and-limits-of-pod-and-container | object | `{"limits":{"cpu":"2","memory":"1Gi"},"requests":{"cpu":"100m","memory":"128Mi"}}` |
121120
| gateway.labels | Additional labels provided to the Gateway resource | object | `{}` |
122121
| gateway.listeners | Set of listeners exposed via the Gateway, also propagated to the Ingress if enabled | list | `[{"allowedRoutes":{"namespaces":{"from":"All"}},"name":"default","port":80,"protocol":"HTTP"}]` |

‎charts/llm-d-infra/templates/NOTES.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ $ helm status {{ .Release.Name }} -n {{ .Release.Namespace }}
99
$ helm get all {{ .Release.Name }} -n {{ .Release.Namespace }}
1010
```
1111

12-
{{- if eq .Values.gateway.gatewayClassName "agentgateway-v2" }}
12+
{{- if or (eq .Values.gateway.gatewayClassName "kgateway") (eq .Values.gateway.gatewayClassName "agentgateway-v2") }}
1313

14-
`gateway.gatewayClassName=agentgateway-v2` is deprecated and is rendered as `agentgateway`.
14+
`gateway.gatewayClassName=kgateway` and `gateway.gatewayClassName=agentgateway-v2` are deprecated and are rendered as `agentgateway`.
1515
Set `gateway.provider=kgateway` or `gateway.provider=agentgateway` and leave `gateway.gatewayClassName` empty, or set it explicitly to `agentgateway`.
1616
{{- end }}

‎charts/llm-d-infra/templates/gateway-infrastructure/_helpers.tpl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Resolve the literal GatewayClass name attached to the Gateway resource.
4242
*/}}
4343
{{- define "gateway.className" -}}
4444
{{- $className := .Values.gateway.gatewayClassName | default "" -}}
45-
{{- if eq $className "agentgateway-v2" -}}
45+
{{- if or (eq $className "kgateway") (eq $className "agentgateway-v2") -}}
4646
agentgateway
4747
{{- else if $className -}}
4848
{{- $className -}}
@@ -61,8 +61,7 @@ Return whether the rendered Gateway should use AgentgatewayParameters.
6161
*/}}
6262
{{- define "gateway.usesAgentgatewayParameters" -}}
6363
{{- $provider := include "gateway.provider" . -}}
64-
{{- $className := include "gateway.className" . -}}
65-
{{- if or (eq $provider "agentgateway") (eq $className "agentgateway") -}}
64+
{{- if or (eq $provider "kgateway") (eq $provider "agentgateway") -}}
6665
true
6766
{{- else -}}
6867
false

‎charts/llm-d-infra/templates/gateway-infrastructure/gateway.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,6 @@ spec:
6767
name: {{ include "gateway.fullname" . }}
6868
group: agentgateway.dev
6969
kind: AgentgatewayParameters
70-
{{- else if and (eq $provider "kgateway") .Values.gateway.gatewayParameters.enabled }}
71-
infrastructure:
72-
parametersRef:
73-
name: {{ include "gateway.fullname" . }}
74-
group: gateway.kgateway.dev
75-
kind: GatewayParameters
7670
{{- else if and (or (eq $provider "istio") (eq $provider "data-science-gateway-class")) .Values.gateway.gatewayParameters.enabled }}
7771
infrastructure:
7872
parametersRef:

‎charts/llm-d-infra/templates/gateway-infrastructure/gatewayparameters.yaml‎

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

‎charts/llm-d-infra/values.schema.json‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"properties": {
5252
"agentgateway": {
5353
"additionalProperties": false,
54-
"description": "Agentgateway-specific parameters rendered into AgentgatewayParameters when gateway.provider resolves to \"agentgateway\", or when \"kgateway\" resolves to the \"agentgateway\" GatewayClass",
54+
"description": "Agentgateway-specific parameters rendered into AgentgatewayParameters when gateway.provider resolves to \"kgateway\" or \"agentgateway\"",
5555
"properties": {
5656
"env": {
5757
"description": "Additional environment variables for the agentgateway proxy",
@@ -181,7 +181,7 @@
181181
},
182182
"gatewayClassName": {
183183
"default": "",
184-
"description": "Deprecated: \"agentgateway-v2\" is mapped to \"agentgateway\".",
184+
"description": "Deprecated: \"kgateway\" and \"agentgateway-v2\" are mapped to \"agentgateway\".",
185185
"required": [],
186186
"title": "gatewayClassName"
187187
},
@@ -202,13 +202,6 @@
202202
"title": "enabled",
203203
"type": "boolean"
204204
},
205-
"floatingUserId": {
206-
"default": false,
207-
"description": "Only used when gateway.provider resolves to \"kgateway\" and gateway.gatewayClassName resolves to \"kgateway\" When true, allows OpenShift to assign user IDs from its allowed range instead of using a hardcoded user ID",
208-
"required": [],
209-
"title": "floatingUserId",
210-
"type": "boolean"
211-
},
212205
"logLevel": {
213206
"default": "warn",
214207
"description": " default: warn enum: [error,warn,info,debug] @schema",
@@ -642,4 +635,4 @@
642635
},
643636
"required": [],
644637
"type": "object"
645-
}
638+
}

‎charts/llm-d-infra/values.schema.tmpl.json‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"properties": {
5252
"agentgateway": {
5353
"additionalProperties": false,
54-
"description": "Agentgateway-specific parameters rendered into AgentgatewayParameters when gateway.provider resolves to \"agentgateway\", or when \"kgateway\" resolves to the \"agentgateway\" GatewayClass",
54+
"description": "Agentgateway-specific parameters rendered into AgentgatewayParameters when gateway.provider resolves to \"kgateway\" or \"agentgateway\"",
5555
"properties": {
5656
"env": {
5757
"description": "Additional environment variables for the agentgateway proxy",
@@ -181,7 +181,7 @@
181181
},
182182
"gatewayClassName": {
183183
"default": "",
184-
"description": "Deprecated: \"agentgateway-v2\" is mapped to \"agentgateway\".",
184+
"description": "Deprecated: \"kgateway\" and \"agentgateway-v2\" are mapped to \"agentgateway\".",
185185
"required": [],
186186
"title": "gatewayClassName"
187187
},
@@ -202,13 +202,6 @@
202202
"title": "enabled",
203203
"type": "boolean"
204204
},
205-
"floatingUserId": {
206-
"default": false,
207-
"description": "Only used when gateway.provider resolves to \"kgateway\" and gateway.gatewayClassName resolves to \"kgateway\" When true, allows OpenShift to assign user IDs from its allowed range instead of using a hardcoded user ID",
208-
"required": [],
209-
"title": "floatingUserId",
210-
"type": "boolean"
211-
},
212205
"logLevel": {
213206
"default": "warn",
214207
"description": " default: warn enum: [error,warn,info,debug] @schema",

‎charts/llm-d-infra/values.yaml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ gateway:
6868
# -- Gateway class that determines the backend used
6969
# -- Leave empty to use the default class name for the selected provider.
7070
# -- With the default provider, this renders as "istio". With "kgateway" or "agentgateway", this renders as "agentgateway".
71-
# -- Deprecated: "agentgateway-v2" is mapped to "agentgateway".
71+
# -- Deprecated: "kgateway" and "agentgateway-v2" are mapped to "agentgateway".
7272
gatewayClassName: ""
7373

7474
# @schema
@@ -96,14 +96,6 @@ gateway:
9696
# @schema
9797
logLevel: warn
9898

99-
# @schema
100-
# type: boolean
101-
# @schema
102-
# -- Enable floating user ID for OpenShift compatibility
103-
# -- Only used when gateway.provider resolves to "kgateway" and gateway.gatewayClassName resolves to "kgateway"
104-
# When true, allows OpenShift to assign user IDs from its allowed range instead of using a hardcoded user ID
105-
floatingUserId: false
106-
10799
# @schema
108100
# $ref: https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master/_definitions.json#/definitions/io.k8s.api.core.v1.ResourceRequirements
109101
# @schema
@@ -121,7 +113,7 @@ gateway:
121113
# @schema
122114
# additionalProperties: false
123115
# @schema
124-
# -- Agentgateway-specific parameters rendered into AgentgatewayParameters when gateway.provider resolves to "agentgateway", or when "kgateway" resolves to the "agentgateway" GatewayClass
116+
# -- Agentgateway-specific parameters rendered into AgentgatewayParameters when gateway.provider resolves to "kgateway" or "agentgateway"
125117
agentgateway:
126118
# @schema
127119
# type: array

0 commit comments

Comments
 (0)