Merge branch 'main' of github.com:kgateway-dev/kgateway into lbip

Signed-off-by: omar <[email protected]>

Author: puertomontt

.custom-gcl.yml

@@ -1,4 +1,4 @@
-version: v2.6.2
+version: v2.7.1
 name: golangci-lint-custom
 destination: _output
 plugins:

.github/workflows/e2e.yaml

@@ -44,17 +44,17 @@ jobs:
         # August 29, 2025: ~9 minutes
         - cluster-name: 'cluster-three'
           go-test-args: '-timeout=25m'
-          go-test-run-regex: '^TestKgateway$$/^DynamicForwardProxy$$|^TestKgateway$$/^Lambda$$|^TestKgateway$$/^AccessLog$$|^TestKgateway$$/^LocalRateLimit$$|^TestKgateway$$/^Cors$$|^TestKgateway$$/^BackendConfigPolicy$$|^TestKgateway$$/^HttpListenerPolicy$$|^TestKgateway$$/^Tracing$$|^TestKgateway$$/^DirectResponse$$|^TestKgateway$$/^AdminServer$$'
+          go-test-run-regex: '^TestKgateway$$/^DynamicForwardProxy$$|^TestKgateway$$/^Lambda$$|^TestKgateway$$/^AccessLog$$|^TestKgateway$$/^LocalRateLimit$$|^TestKgateway$$/^Cors$$|^TestKgateway$$/^BackendConfigPolicy$$|^TestKgateway$$/^ListenerPolicy$$|^TestKgateway$$/^Tracing$$|^TestKgateway$$/^DirectResponse$$|^TestKgateway$$/^AdminServer$$'
           localstack: 'true'
         # August 29, 2025: ~9 minutes
         - cluster-name: 'cluster-four'
           go-test-args: '-timeout=25m'
-          go-test-run-regex: '^TestKgateway$$/^ExtProc$$|^TestKgateway$$/^ExtAuth$$|^TestKgateway$$/^PolicySelector$$|^TestKgateway$$/^Backends$$|^TestKgateway$$/^BackendTLSPolicies$$|^TestKgateway$$/^CSRF$$|^TestKgateway$$/^AutoHostRewrite$$|^TestKgateway$$/^LeaderElection$$|^TestKgateway$$/^ListenerPolicyProxyProtocol$$|^TestKgateway$$/^Compression$$|^TestParallelControllers$$'
+          go-test-run-regex: '^TestKgateway$$/^ExtProc$$|^TestKgateway$$/^ExtAuth$$|^TestKgateway$$/^PolicySelector$$|^TestKgateway$$/^Backends$$|^TestKgateway$$/^BackendTLSPolicies$$|^TestKgateway$$/^CSRF$$|^TestKgateway$$/^AutoHostRewrite$$|^TestKgateway$$/^LeaderElection$$|^TestKgateway$$/^Compression$$|^TestParallelControllers$$'
           localstack: 'false'
         # August 29, 2025: ~10 minutes
         - cluster-name: 'cluster-five'
           go-test-args: '-timeout=25m'
-          go-test-run-regex: '^TestKgateway$$/^TimeoutRetry$$|^TestKgateway$$/^HeaderModifiers$$|^TestKgateway$$/^RBAC$$|^TestKgateway$$/^Deployer$$|^TestKgateway$$/^Transforms$$|^TestRouteReplacement$$|^TestKgateway$$/^RouteDelegation$$|^TestKgateway$$/^JWT$$|^TestKgateway$$/^BasicAuth$$'
+          go-test-run-regex: '^TestKgateway$$/^TimeoutRetry$$|^TestKgateway$$/^HeaderModifiers$$|^TestKgateway$$/^RBAC$$|^TestKgateway$$/^APIKeyAuth$$|^TestKgateway$$/^Deployer$$|^TestKgateway$$/^Transforms$$|^TestRouteReplacement$$|^TestKgateway$$/^RouteDelegation$$|^TestKgateway$$/^JWT$$|^TestKgateway$$/^BasicAuth$$'
           localstack: 'false'
         # August 29, 2025: ~9 minutes
         - cluster-name: 'cluster-six'

Makefile

@@ -192,6 +192,13 @@ test-with-coverage: GINKGO_FLAGS += $(GINKGO_COVERAGE_FLAGS)
 test-with-coverage: test
 	go tool cover -html $(OUTPUT_DIR)/coverage.cov
 
+.PHONY: golden-deployer
+golden-deployer:  ## Refreshes golden files for ./test/deployer snapshot testing
+	REFRESH_GOLDEN=true go test ./test/deployer/... > /dev/null || true
+	@echo ""
+	@echo "This must pass after refreshing:"
+	go test ./test/deployer/...
+
 #----------------------------------------------------------------------------------
 # Env test
 #----------------------------------------------------------------------------------

api/settings/settings.go

@@ -238,6 +238,12 @@ type Settings struct {
 	// EnableExperimentalGatewayAPIFeatures enables kgateway to support experimental features and APIs
 	EnableExperimentalGatewayAPIFeatures bool `split_words:"true" default:"true"`
 
+	// GwpAgwpCompatibility controls whether agentgateway data plane Gateways can use
+	// GatewayParameters. When set to false, only AgentgatewayParameters are allowed,
+	// and using GatewayParameters will result in an error. Defaults to true for
+	// backward compatibility.
+	GwpAgwpCompatibility bool `split_words:"true" default:"true"`
+
 	// GatewayClassParametersRefs configures the GatewayParameters references to set on the default GatewayClasses.
 	// Format: JSON map where keys are GatewayClass names and values are objects with "name" (required),
 	// "namespace" (required), "group" (optional), and "kind" (optional) fields.

api/settings/settings_test.go

@@ -51,6 +51,7 @@ func allEnvVarsSet() map[string]string {
 		"KGW_XDS_AUTH":                                 "false",
 		"KGW_XDS_TLS":                                  "true",
 		"KGW_ENABLE_EXPERIMENTAL_GATEWAY_API_FEATURES": "false",
+		"KGW_GWP_AGWP_COMPATIBILITY":                   "false",
 	}
 }
 
@@ -104,6 +105,7 @@ func TestSettings(t *testing.T) {
 				XdsAuth:                              true,
 				XdsTLS:                               false,
 				EnableExperimentalGatewayAPIFeatures: true,
+				GwpAgwpCompatibility:                 true,
 				GatewayClassParametersRefs:           GatewayClassParametersRefs{},
 			},
 		},
@@ -143,6 +145,7 @@ func TestSettings(t *testing.T) {
 				XdsAuth:                              false,
 				XdsTLS:                               true,
 				EnableExperimentalGatewayAPIFeatures: false,
+				GwpAgwpCompatibility:                 false,
 				GatewayClassParametersRefs: GatewayClassParametersRefs{
 					"kgateway": {
 						Name:      "custom-gwp",
@@ -234,6 +237,7 @@ func TestSettings(t *testing.T) {
 				XdsAuth:                              true,
 				XdsTLS:                               false,
 				EnableExperimentalGatewayAPIFeatures: true,
+				GwpAgwpCompatibility:                 true,
 				GatewayClassParametersRefs:           GatewayClassParametersRefs{},
 			},
 		},

api/tests/testdata/agentgateway_parameters_invalid.yaml

@@ -0,0 +1,40 @@
+_err: "min' value must be less than or equal to the 'max"
+apiVersion: agentgateway.dev/v1alpha1
+kind: AgentgatewayParameters
+metadata:
+  name: shutdown-min-gt-max
+spec:
+  shutdown:
+    min: 61
+    max: 60
+---
+# min and max are required, which avoids the more confusing error
+# "AgentgatewayParameters/shutdown-min-gt-max/: spec.shutdown: Invalid value:
+# \"object\": no such key: min evaluating rule: The 'min' value
+# must be less than or equal to the 'max' value."
+_err: "AgentgatewayParameters/shutdown-min-gt-max/: spec.shutdown.min: Required value"
+apiVersion: agentgateway.dev/v1alpha1
+kind: AgentgatewayParameters
+metadata:
+  name: shutdown-min-gt-max
+spec:
+  shutdown:
+    max: 60
+---
+_err: "AgentgatewayParameters/shutdown-min-gt-max/: spec.shutdown.max: Required value"
+apiVersion: agentgateway.dev/v1alpha1
+kind: AgentgatewayParameters
+metadata:
+  name: shutdown-min-gt-max
+spec:
+  shutdown:
+    min: 0
+---
+_err: "Unsupported value"
+apiVersion: agentgateway.dev/v1alpha1
+kind: AgentgatewayParameters
+metadata:
+  name: logging-format-invalid
+spec:
+  logging:
+    format: Unknown

api/tests/testdata/agentgateway_parameters_valid.yaml

@@ -0,0 +1,8 @@
+apiVersion: agentgateway.dev/v1alpha1
+kind: AgentgatewayParameters
+metadata:
+  name: shutdown-min-gt-max
+spec:
+  shutdown:
+    max: 0
+    min: 0