feat: GatewayClass agentgateway-v2, controllerName agentgateway.dev/agentgateway

AGENTS.md

@@ -8,7 +8,7 @@ kgateway is a **dual control plane** implementing the Kubernetes Gateway API for
 ### Controller Names & Isolation
 kgateway supports **two independent controllers** that can run side-by-side:
 - **Envoy Controller**: `kgateway.dev/kgateway` (defined in `wellknown.DefaultGatewayControllerName`)
-- **Agentgateway Controller**: `kgateway.dev/agentgateway` (defined in `wellknown.DefaultAgwControllerName`)
+- **Agentgateway Controller**: `agentgateway.dev/agentgateway` (defined in `wellknown.DefaultAgwControllerName`)
 
 **Critical Requirements:**
 1. Controllers MUST always respect `GatewayClass.spec.controllerName` Classname can matter, in the case of waypoints, but its always more specific information
@@ -34,7 +34,7 @@ kgateway supports **two independent controllers** that can run side-by-side:
 **Deployment:**
 - Gateway reconciler checks enable flags before calling deployer
 - Deployer selects chart based on Gateway's controllerName from GatewayClass
-- Chart selection: envoy chart for `kgateway.dev/kgateway`, agentgateway chart for `kgateway.dev/agentgateway`
+- Chart selection: envoy chart for `kgateway.dev/kgateway`, agentgateway chart for `agentgateway.dev/agentgateway`
 
 **Enable Flags:**
 - `EnableEnvoy` (default: true): Controls if envoy ProxySyncer, StatusSyncer, and GatewayClass creation run

Makefile

@@ -853,7 +853,7 @@ conformance-%:  ## Run only the specified Gateway API conformance test by ShortN
 #----------------------------------------------------------------------------------
 
 # Agent Gateway conformance test configuration
-AGW_CONFORMANCE_GATEWAY_CLASS ?= agentgateway
+AGW_CONFORMANCE_GATEWAY_CLASS ?= agentgateway-v2
 AGW_CONFORMANCE_REPORT_ARGS ?= -report-output=$(TEST_ASSET_DIR)/conformance/agw-$(VERSION)-report.yaml -organization=kgateway-dev -project=kgateway -version=$(VERSION) -url=github.com/kgateway-dev/kgateway -contact=github.com/kgateway-dev/kgateway/issues/new/choose
 AGW_CONFORMANCE_ARGS := -gateway-class=$(AGW_CONFORMANCE_GATEWAY_CLASS) $(AGW_CONFORMANCE_REPORT_ARGS)
 

api/v1alpha1/kgateway/gateway_parameters_types.go

@@ -83,7 +83,7 @@ type KubernetesProxyConfig struct {
 	Deployment *ProxyDeployment `json:"deployment,omitempty"`
 
 	// Configuration for the container running Envoy.
-	// If the Gateway uses a GatewayClass with controllerName: kgateway.dev/agentgateway,
+	// If the Gateway uses a GatewayClass with controllerName: agentgateway.dev/agentgateway,
 	// the EnvoyContainer values will be ignored.
 	//
 	// +optional
@@ -679,7 +679,7 @@ func (in *StatsMatcher) GetExclusionList() []shared.StringMatcher {
 
 // Agentgateway configures the agentgateway dataplane integration.
 // The agentgateway dataplane is automatically used when the Gateway references a GatewayClass
-// with controllerName: kgateway.dev/agentgateway.
+// with controllerName: agentgateway.dev/agentgateway.
 type Agentgateway struct {
 	// Log level for the agentgateway. Defaults to info.
 	// Levels include "trace", "debug", "info", "error", "warn". See: https://docs.rs/tracing/latest/tracing/struct.Level.html

examples/ai-backend-with-routes.yaml

@@ -3,7 +3,7 @@ kind: Gateway
 metadata:
   name: ai-gateway
 spec:
-  gatewayClassName: agentgateway
+  gatewayClassName: agentgateway-v2
   listeners:
   - name: http
     port: 8080

examples/ai-bedrock-with-prompt-caching.yaml

@@ -3,7 +3,7 @@ kind: Gateway
 metadata:
   name: ai-gateway
 spec:
-  gatewayClassName: agentgateway
+  gatewayClassName: agentgateway-v2
   listeners:
   - name: http
     port: 8080

install/helm/kgateway-crds/templates/gateway.kgateway.dev_gatewayparameters.yaml

@@ -648,7 +648,7 @@ spec:
                   envoyContainer:
                     description: |-
                       Configuration for the container running Envoy.
-                      If the Gateway uses a GatewayClass with controllerName: kgateway.dev/agentgateway,
+                      If the Gateway uses a GatewayClass with controllerName: agentgateway.dev/agentgateway,
                       the EnvoyContainer values will be ignored.
                     properties:
                       bootstrap:

pkg/agentgateway/plugins/testdata/backendpolicy/ai.yaml

@@ -158,4 +158,4 @@ status:
       reason: Attached
       status: "True"
       type: Attached
-    controllerName: kgateway.dev/agentgateway
+    controllerName: agentgateway.dev/agentgateway

pkg/agentgateway/plugins/testdata/backendpolicy/mcp-authz-gateway.yaml

@@ -71,4 +71,4 @@ status:
       reason: Attached
       status: "True"
       type: Attached
-    controllerName: kgateway.dev/agentgateway
+    controllerName: agentgateway.dev/agentgateway

pkg/agentgateway/plugins/testdata/backendpolicy/mcp-authz-route.yaml

@@ -71,4 +71,4 @@ status:
       reason: Attached
       status: "True"
       type: Attached
-    controllerName: kgateway.dev/agentgateway
+    controllerName: agentgateway.dev/agentgateway

pkg/agentgateway/plugins/testdata/backendpolicy/simple.yaml

@@ -96,4 +96,4 @@ status:
       reason: PartiallyValid
       status: "True"
       type: Accepted
-    controllerName: kgateway.dev/agentgateway
+    controllerName: agentgateway.dev/agentgateway

pkg/agentgateway/plugins/testdata/frontendpolicy/full.yaml

@@ -129,4 +129,4 @@ status:
       reason: Attached
       status: "True"
       type: Attached
-    controllerName: kgateway.dev/agentgateway
+    controllerName: agentgateway.dev/agentgateway

pkg/agentgateway/plugins/testdata/trafficpolicy/cel-invalid.yaml

@@ -49,4 +49,4 @@ status:
       reason: PartiallyValid
       status: "True"
       type: Accepted
-    controllerName: kgateway.dev/agentgateway
+    controllerName: agentgateway.dev/agentgateway

pkg/agentgateway/plugins/testdata/trafficpolicy/cel.yaml

@@ -73,4 +73,4 @@ status:
       reason: Attached
       status: "True"
       type: Attached
-    controllerName: kgateway.dev/agentgateway
+    controllerName: agentgateway.dev/agentgateway

pkg/agentgateway/plugins/testdata/trafficpolicy/cors.yaml

@@ -77,4 +77,4 @@ status:
       reason: Attached
       status: "True"
       type: Attached
-    controllerName: kgateway.dev/agentgateway
+    controllerName: agentgateway.dev/agentgateway

pkg/agentgateway/plugins/testdata/trafficpolicy/header-modifier.yaml

@@ -89,4 +89,4 @@ status:
       reason: Attached
       status: "True"
       type: Attached
-    controllerName: kgateway.dev/agentgateway
+    controllerName: agentgateway.dev/agentgateway

pkg/agentgateway/plugins/testdata/trafficpolicy/retry-invalid-attempts-exceeds-i32.yaml

@@ -32,4 +32,4 @@ status:
       reason: Pending
       status: "False"
       type: Attached
-    controllerName: kgateway.dev/agentgateway
+    controllerName: agentgateway.dev/agentgateway

pkg/agentgateway/plugins/testdata/trafficpolicy/retry-invalid-attempts-negative.yaml

@@ -32,4 +32,4 @@ status:
       reason: Pending
       status: "False"
       type: Attached
-    controllerName: kgateway.dev/agentgateway
+    controllerName: agentgateway.dev/agentgateway

pkg/agentgateway/plugins/testdata/trafficpolicy/retry.yaml

@@ -57,4 +57,4 @@ status:
       reason: Attached
       status: "True"
       type: Attached
-    controllerName: kgateway.dev/agentgateway
+    controllerName: agentgateway.dev/agentgateway

pkg/agentgateway/plugins/testdata/trafficpolicy/timeout.yaml

@@ -45,4 +45,4 @@ status:
       reason: Attached
       status: "True"
       type: Attached
-    controllerName: kgateway.dev/agentgateway
+    controllerName: agentgateway.dev/agentgateway

pkg/agentgateway/translator/testdata/gateways/_defaults.yaml

@@ -1,6 +1,6 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: GatewayClass
 metadata:
-  name: agentgateway
+  name: agentgateway-v2
 spec:
-  controllerName: kgateway.dev/agentgateway
+  controllerName: agentgateway.dev/agentgateway

pkg/agentgateway/translator/testdata/gateways/mtls-listeners.yaml

@@ -4,7 +4,7 @@ metadata:
   name: test-gateway
   namespace: default
 spec:
-  gatewayClassName: agentgateway
+  gatewayClassName: agentgateway-v2
   tls:
     frontend:
       perPort:

pkg/agentgateway/translator/testdata/gateways/simple-http.yaml

@@ -4,7 +4,7 @@ metadata:
   name: test-gateway
   namespace: default
 spec:
-  gatewayClassName: agentgateway
+  gatewayClassName: agentgateway-v2
   listeners:
     - name: http
       port: 80

pkg/agentgateway/translator/testdata/gateways/tls-listeners-cross-ns.yaml

@@ -4,7 +4,7 @@ metadata:
   name: test-gateway
   namespace: default
 spec:
-  gatewayClassName: agentgateway
+  gatewayClassName: agentgateway-v2
   listeners:
     - name: valid
       port: 443

pkg/agentgateway/translator/testdata/gateways/tls-listeners.yaml

@@ -4,7 +4,7 @@ metadata:
   name: test-gateway
   namespace: default
 spec:
-  gatewayClassName: agentgateway
+  gatewayClassName: agentgateway-v2
   listeners:
     - name: https
       port: 443

pkg/agentgateway/translator/testdata/gateways/tls-passthrough-listeners.yaml

@@ -4,7 +4,7 @@ metadata:
   name: test-gateway
   namespace: default
 spec:
-  gatewayClassName: agentgateway
+  gatewayClassName: agentgateway-v2
   listeners:
     - name: tls
       port: 443

pkg/agentgateway/translator/testdata/routes/_defaults.yaml

@@ -6,17 +6,17 @@ metadata:
 apiVersion: gateway.networking.k8s.io/v1
 kind: GatewayClass
 metadata:
-  name: agentgateway
+  name: agentgateway-v2
 spec:
-  controllerName: kgateway.dev/agentgateway
+  controllerName: agentgateway.dev/agentgateway
 ---
 apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
   name: test-gateway
   namespace: default
 spec:
-  gatewayClassName: agentgateway
+  gatewayClassName: agentgateway-v2
   listeners:
     - name: http
       port: 80

pkg/agentgateway/translator/testdata/routes/basic-http.yaml

@@ -62,7 +62,7 @@ status:
         reason: ResolvedRefs
         status: "True"
         type: ResolvedRefs
-      controllerName: kgateway.dev/agentgateway
+      controllerName: agentgateway.dev/agentgateway
       parentRef:
         group: gateway.networking.k8s.io
         kind: Gateway

pkg/agentgateway/translator/testdata/routes/basic-tcp.yaml

@@ -5,7 +5,7 @@ metadata:
   name: tcp-gw
   namespace: default
 spec:
-  gatewayClassName: agentgateway
+  gatewayClassName: agentgateway-v2
   listeners:
     - name: foo
       protocol: TCP
@@ -100,7 +100,7 @@ status:
         reason: ResolvedRefs
         status: "True"
         type: ResolvedRefs
-      controllerName: kgateway.dev/agentgateway
+      controllerName: agentgateway.dev/agentgateway
       parentRef:
         group: gateway.networking.k8s.io
         kind: Gateway
@@ -126,7 +126,7 @@ status:
         reason: ResolvedRefs
         status: "True"
         type: ResolvedRefs
-      controllerName: kgateway.dev/agentgateway
+      controllerName: agentgateway.dev/agentgateway
       parentRef:
         group: gateway.networking.k8s.io
         kind: Gateway

pkg/agentgateway/translator/testdata/routes/grpc-header-route.yaml

@@ -78,7 +78,7 @@ status:
         reason: ResolvedRefs
         status: "True"
         type: ResolvedRefs
-      controllerName: kgateway.dev/agentgateway
+      controllerName: agentgateway.dev/agentgateway
       parentRef:
         group: gateway.networking.k8s.io
         kind: Gateway

pkg/agentgateway/translator/testdata/routes/httproute-filters.yaml

@@ -310,7 +310,7 @@ status:
         reason: ResolvedRefs
         status: "True"
         type: ResolvedRefs
-      controllerName: kgateway.dev/agentgateway
+      controllerName: agentgateway.dev/agentgateway
       parentRef:
         group: gateway.networking.k8s.io
         kind: Gateway

pkg/agentgateway/translator/testdata/routes/httproute-missing-dest.yaml

@@ -51,7 +51,7 @@ status:
         reason: BackendNotFound
         status: "False"
         type: ResolvedRefs
-      controllerName: kgateway.dev/agentgateway
+      controllerName: agentgateway.dev/agentgateway
       parentRef:
         group: gateway.networking.k8s.io
         kind: Gateway

pkg/agentgateway/translator/testdata/routes/httproute-timeout-retry.yaml

@@ -141,7 +141,7 @@ status:
         reason: ResolvedRefs
         status: "True"
         type: ResolvedRefs
-      controllerName: kgateway.dev/agentgateway
+      controllerName: agentgateway.dev/agentgateway
       parentRef:
         group: gateway.networking.k8s.io
         kind: Gateway

pkg/agentgateway/translator/testdata/routes/inferencepool.yaml

@@ -124,7 +124,7 @@ status:
         reason: ResolvedRefs
         status: "True"
         type: ResolvedRefs
-      controllerName: kgateway.dev/agentgateway
+      controllerName: agentgateway.dev/agentgateway
       parentRef:
         group: gateway.networking.k8s.io
         kind: Gateway

pkg/agentgateway/translator/testdata/routes/matchers.yaml

@@ -99,7 +99,7 @@ status:
         reason: ResolvedRefs
         status: "True"
         type: ResolvedRefs
-      controllerName: kgateway.dev/agentgateway
+      controllerName: agentgateway.dev/agentgateway
       parentRef:
         group: gateway.networking.k8s.io
         kind: Gateway

pkg/agentgateway/translator/testdata/routes/multi-rule-grpc-route.yaml

@@ -92,7 +92,7 @@ status:
         reason: ResolvedRefs
         status: "True"
         type: ResolvedRefs
-      controllerName: kgateway.dev/agentgateway
+      controllerName: agentgateway.dev/agentgateway
       parentRef:
         group: gateway.networking.k8s.io
         kind: Gateway

pkg/agentgateway/translator/testdata/routes/simple-grpc-route.yaml

@@ -62,7 +62,7 @@ status:
         reason: ResolvedRefs
         status: "True"
         type: ResolvedRefs
-      controllerName: kgateway.dev/agentgateway
+      controllerName: agentgateway.dev/agentgateway
       parentRef:
         group: gateway.networking.k8s.io
         kind: Gateway

pkg/agentgateway/translator/testdata/routes/two-routes-same-gateway.yaml

@@ -104,7 +104,7 @@ status:
         reason: ResolvedRefs
         status: "True"
         type: ResolvedRefs
-      controllerName: kgateway.dev/agentgateway
+      controllerName: agentgateway.dev/agentgateway
       parentRef:
         group: gateway.networking.k8s.io
         kind: Gateway
@@ -129,7 +129,7 @@ status:
         reason: ResolvedRefs
         status: "True"
         type: ResolvedRefs
-      controllerName: kgateway.dev/agentgateway
+      controllerName: agentgateway.dev/agentgateway
       parentRef:
         group: gateway.networking.k8s.io
         kind: Gateway

pkg/deployer/deployer_test.go

@@ -504,7 +504,7 @@ var _ = Describe("Deployer", func() {
 			agwp = agentgatewayParam("agent-gateway-params")
 			gwc = &gwv1.GatewayClass{
 				ObjectMeta: metav1.ObjectMeta{
-					Name: "agentgateway",
+					Name: wellknown.DefaultAgwClassName,
 				},
 				Spec: gwv1.GatewayClassSpec{
 					ControllerName: wellknown.DefaultAgwControllerName,
@@ -525,7 +525,7 @@ var _ = Describe("Deployer", func() {
 					Namespace: defaultNamespace,
 				},
 				Spec: gwv1.GatewaySpec{
-					GatewayClassName: "agentgateway",
+					GatewayClassName: wellknown.DefaultAgwClassName,
 					Infrastructure: &gwv1.GatewayInfrastructure{
 						ParametersRef: &gwv1.LocalParametersReference{
 							Group: agentgatewayv1alpha1.GroupName,

pkg/deployer/gateway_parameters_test.go

@@ -22,7 +22,7 @@ func TestGetInMemoryGatewayParameters(t *testing.T) {
 
 	const (
 		envoyController = "kgateway.dev/kgateway"
-		agwController   = "kgateway.dev/agentgateway"
+		agwController   = "agentgateway.dev/agentgateway"
 		waypointClass   = "waypoint"
 	)