kgateway-dev · npolshakova · May 19, 2025 · May 2, 2025 · May 6, 2025 · May 6, 2025
diff --git a/.github/actions/setup-kind-cluster/action.yaml b/.github/actions/setup-kind-cluster/action.yaml
@@ -29,6 +29,10 @@ inputs:
     required: false
     default: "false"
     description: Whether to install localstack
+  agentgateway:
+    required: false
+    default: "false"
+    description: Enable the agentgateway integration with kgateway
 
 runs:
   using: "composite"
@@ -48,6 +52,8 @@ runs:
         ISTIO_VERSION: ${{ inputs.istio-version }}
         CONFORMANCE_VERSION: ${{ inputs.kgateway-api-version }}
         LOCALSTACK: ${{ inputs.localstack }}
+        AGENTGATEWAY: ${{ inputs.agentgateway }}
         # AI Tests rely on metal LB
         CONFORMANCE: true
-      run: ./hack/kind/setup-kind.sh
+      run: |
+        ./hack/kind/setup-kind.sh
diff --git a/.github/workflows/pr-kubernetes-tests.yaml b/.github/workflows/pr-kubernetes-tests.yaml
@@ -51,6 +51,11 @@ jobs:
           go-test-args: '-v -timeout=25m'
           go-test-run-regex: '^TestAIExtension'
           localstack: 'false'
+        # May 6, 2025: 5 minutes
+        - cluster-name: 'agent-gateway-cluster'
+          go-test-args: '-v -timeout=25m'
+          go-test-run-regex: '^TestAgentGatewayIntegration'
+          agentgateway: 'true'
 
 #         # Dec 4, 2024: 23 minutes
 #         - cluster-name: 'cluster-two'
@@ -109,6 +114,7 @@ jobs:
         helm-version: ${{ steps.dotenv.outputs.helm_version }}
         istio-version: ${{ steps.dotenv.outputs.istio_version }}
         localstack: ${{ matrix.test.localstack }}
+        agentgateway: ${{ matrix.test.agentgateway }}
     - id: run-tests
       uses: ./.github/actions/kubernetes-e2e-tests
       with:

diff --git a/Makefile b/Makefile
@@ -772,6 +772,17 @@ kind-list-images: ## List solo-io images in the kind cluster named {CLUSTER_NAME
 kind-prune-images: ## Remove images in the kind cluster named {CLUSTER_NAME}
 	docker exec -ti $(CLUSTER_NAME)-control-plane crictl rmi --prune
 
+#----------------------------------------------------------------------------------
+# A2A Test Server (for agentgateway a2a integration in e2e tests)
+#----------------------------------------------------------------------------------
+
+TEST_A2A_AGENT_SERVER_DIR := $(ROOTDIR)/test/kubernetes/e2e/features/agentgateway/a2a-example
+.PHONY: test-a2a-agent-docker
+test-a2a-agent-docker:
+	docker buildx build $(LOAD_OR_PUSH) $(PLATFORM_MULTIARCH) -f $(TEST_A2A_AGENT_SERVER_DIR)/Dockerfile $(TEST_A2A_AGENT_SERVER_DIR) \
+		-t $(IMAGE_REGISTRY)/test-a2a-agent:$(VERSION)
+
+
 #----------------------------------------------------------------------------------
 # AI Extensions Test Server (for mocking AI Providers in e2e tests)
 #----------------------------------------------------------------------------------

diff --git a/api/applyconfiguration/api/v1alpha1/agentgateway.go b/api/applyconfiguration/api/v1alpha1/agentgateway.go
diff --git a/api/applyconfiguration/api/v1alpha1/kubernetesproxyconfig.go b/api/applyconfiguration/api/v1alpha1/kubernetesproxyconfig.go
diff --git a/api/applyconfiguration/internal/internal.go b/api/applyconfiguration/internal/internal.go
diff --git a/api/applyconfiguration/utils.go b/api/applyconfiguration/utils.go
diff --git a/api/v1alpha1/gateway_parameters_types.go b/api/v1alpha1/gateway_parameters_types.go
@@ -120,6 +120,11 @@ type KubernetesProxyConfig struct {
 	// +kubebuilder:validation:Optional
 	AiExtension *AiExtension `json:"aiExtension,omitempty"`
 
+	// Configure the AgentGateway integration
+	//
+	// +kubebuilder:validation:Optional
+	AgentGateway *AgentGateway `json:"agentGateway,omitempty"`
+
 	// Used to unset the `runAsUser` values in security contexts.
 	FloatingUserId *bool `json:"floatingUserId,omitempty"`
 }
@@ -187,6 +192,13 @@ func (in *KubernetesProxyConfig) GetAiExtension() *AiExtension {
 	return in.AiExtension
 }
 
+func (in *KubernetesProxyConfig) GetAgentGateway() *AgentGateway {
+	if in == nil {
+		return nil
+	}
+	return in.AgentGateway
+}
+
 func (in *KubernetesProxyConfig) GetFloatingUserId() *bool {
 	if in == nil {
 		return nil
@@ -746,3 +758,31 @@ func (in *CustomLabel) GetKeyDelimiter() *string {
 	}
 	return in.KeyDelimiter
 }
+
+// Configuration of the AgentGateway integration
+type AgentGateway struct {
+	// Whether to enable the extension.
+	//
+	// +kubebuilder:validation:Optional
+	Enabled *bool `json:"enabled,omitempty"`
+
+	// 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
+	//
+	// +kubebuilder:validation:Optional
+	LogLevel *string `json:"logLevel,omitempty"`
+}
+
+func (in *AgentGateway) GetEnabled() *bool {
+	if in == nil {
+		return nil
+	}
+	return in.Enabled
+}
+
+func (in *AgentGateway) GetLogLevel() *string {
+	if in == nil {
+		return nil
+	}
+	return in.LogLevel
+}
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/go.mod b/go.mod
@@ -112,6 +112,8 @@ require (
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
 	github.com/ProtonMail/go-crypto v1.0.0 // indirect
+	// TODO: pin to release version. Needed https://github.com/agentgateway/agentgateway/pull/115 for go mod fix
+	github.com/agentgateway/agentgateway v0.4.31-0.20250519135723-61536c2b3fa0
 	github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
 	github.com/alexkohler/nakedret/v2 v2.0.5 // indirect
 	github.com/alexkohler/prealloc v1.0.0 // indirect

diff --git a/go.sum b/go.sum
@@ -212,6 +212,8 @@ github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMx
 github.com/Shopify/toxiproxy/v2 v2.1.6-0.20210914104332-15ea381dcdae/go.mod h1:/cvHQkZ1fst0EmZnA5dFtiQdWCNCFYzb+uE2vqVgvx0=
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
+github.com/agentgateway/agentgateway v0.4.31-0.20250519135723-61536c2b3fa0 h1:4THComsdsccCKRdO3lFinPZId6/ISSk6ijEiO44KJps=
+github.com/agentgateway/agentgateway v0.4.31-0.20250519135723-61536c2b3fa0/go.mod h1:geHd31xH5d8OrCRuRyvnDxBeqSZ9+O9VhL8VJAfcA+E=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
 github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
 github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=

diff --git a/hack/kind/setup-kind.sh b/hack/kind/setup-kind.sh
@@ -73,6 +73,10 @@ else
   if [[ $CONFORMANCE == "true" ]]; then
     VERSION=$VERSION make kind-build-and-load-test-ai-provider
   fi
+
+  if [[ $AGENTGATEWAY == "true" ]]; then
+    VERSION=$VERSION make kind-build-and-load-test-a2a-agent
+  fi
 fi
 
 # 5. Build the gloo command line tool, ensuring we have one in the `_output` folder

diff --git a/hack/utils/oss_compliance/osa_provided.md b/hack/utils/oss_compliance/osa_provided.md
@@ -1,5 +1,6 @@
 Name|Version|License
 ---|---|---
+[agentgateway/agentgateway](https://github.com/agentgateway/agentgateway)|v0.4.31-0.20250519135723-61536c2b3fa0|Apache License 2.0
 [avast/retry-go](https://github.com/avast/retry-go)|v2.4.3+incompatible|MIT License
 [retry-go/v4](https://github.com/avast/retry-go)|v4.3.3|MIT License
 [caarlos0/log](https://github.com/caarlos0/log)|v0.4.6|MIT License

diff --git a/install/helm/kgateway-crds/templates/gateway.kgateway.dev_gatewayparameters.yaml b/install/helm/kgateway-crds/templates/gateway.kgateway.dev_gatewayparameters.yaml
@@ -33,6 +33,13 @@ spec:
             properties:
               kube:
                 properties:
+                  agentGateway:
+                    properties:
+                      enabled:
+                        type: boolean
+                      logLevel:
+                        type: string
+                    type: object
                   aiExtension:
                     properties:
                       enabled:

diff --git a/install/helm/kgateway/templates/deployment.yaml b/install/helm/kgateway/templates/deployment.yaml
@@ -82,6 +82,10 @@ spec:
               value: {{ $value | quote }}
             {{- end }}
             {{- end }}
+            {{- if .Values.agentGateway.enabled }}
+            - name: KGW_ENABLE_AGENT_GATEWAY
+              value: "true"
+            {{- end }}
             # TODO: Remove this once the cleanup is done. Required as the gloo-system
             # namespace is the default namespace and conformance will fail as a result.
             - name: POD_NAMESPACE

diff --git a/install/helm/kgateway/values.yaml b/install/helm/kgateway/values.yaml
@@ -65,3 +65,6 @@ image:
 inferenceExtension:
   enabled: false
   autoProvision: false
+
+agentGateway:
+  enabled: false
diff --git a/internal/kgateway/agentgatewaysyncer/README.md b/internal/kgateway/agentgatewaysyncer/README.md
@@ -0,0 +1,11 @@
+# agentgateway syncer
+
+This syncer configures xds updates for the [agentgateway](https://agentgateway.dev/) data plane. 
+
+### APIs
+
+The syncer uses the following APIs:
+
+- [a2a](https://github.com/agentgateway/agentgateway/tree/main/go/api/a2a/a2a)
+- [mcp](https://github.com/agentgateway/agentgateway/tree/main/go/api/mcp/mcp)
+- [listener](https://github.com/agentgateway/agentgateway/tree/main/go/api/listener)
diff --git a/internal/kgateway/agentgatewaysyncer/const.go b/internal/kgateway/agentgatewaysyncer/const.go
@@ -0,0 +1,16 @@
+package agentgatewaysyncer
+
+const (
+	TargetTypeA2AUrl      = "type.googleapis.com/agentgateway.dev.a2a.target.Target"
+	TargetTypeMcpUrl      = "type.googleapis.com/agentgateway.dev.mcp.target.Target"
+	TargetTypeListenerUrl = "type.googleapis.com/agentgateway.dev.listener.Listener"
+
+	MCPProtocol = "kgateway.dev/mcp"
+	A2AProtocol = "kgateway.dev/a2a"
+
+	MCPPathAnnotation = "kgateway.dev/mcp-path"
+	A2APathAnnotation = "kgateway.dev/a2a-path"
+
+	// Needs to match agentgateway role configured here: https://github.com/agentgateway/agentgateway/blob/main/crates/agentgateway/src/xds/client.rs#L293
+	OwnerNodeId = "agentgateway-api"
+)