chore: Bump gateway api to 1.6 by davidjumani · Pull Request #14245 · kgateway-dev/kgateway

davidjumani · 2026-06-12T18:56:06Z

Description

Bumps gateway-api to 1.6

Important

This introduces the kgateway.dev/Programmed condition on Routes - Any issues with a route (Conflicts, dropped, replaced, etc.) will be surfaced on this condition instead of the Accepted condition. The Accepted condition only indicates whether the route is semantically valid

Change Type

/kind feature

Changelog

Add support for Gateway API 1.6.0

Additional Notes

Signed-off-by: David Jumani <[email protected]>

Copilot

Pull request overview

Updates this repository to target Gateway API 1.6 (currently using v1.6.0-rc.1) and refreshes the corresponding Kubernetes / Istio / tooling dependencies, CRD schemas, and CI lanes to exercise the newer API versions.

Changes:

Bump Gateway API + conformance versions to v1.6.0-rc.1 and update related dependency versions (k8s.io/*, controller-runtime, istio.io/*, etc.).
Refresh Helm CRD templates to match updated upstream schema/documentation text for Gateway API resources.
Extend nightly CI matrices to include Gateway API v1.6.0-rc.1 (standard + experimental) with guard logic for v2.2.x.

Reviewed changes

Copilot reviewed 8 out of 9 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
pkg/utils/filter_types/filter_types.gen.go	Adds a new Envoy extension blank-import to keep generated filter type registration in sync with updated deps.
pkg/pluginsdk/collections/delayed_dynamic_informer.go	Adds `HasSyncedChecker()` to satisfy newer client-go interfaces (currently implemented as a panic).
Makefile	Bumps conformance/Gateway API version used by make targets to `v1.6.0-rc.1`.
install/helm/kgateway-crds/templates/gateway.kgateway.dev_trafficpolicies.yaml	Updates embedded schema descriptions (notably CORS fields) to match updated field naming/semantics.
install/helm/kgateway-crds/templates/gateway.kgateway.dev_gatewayparameters.yaml	Syncs embedded Kubernetes schema descriptions with updated upstream wording.
hack/utils/oss_compliance/osa_provided.md	Updates recorded dependency versions for OSS compliance output.
go.mod	Bumps Gateway API, Kubernetes, Istio, and other Go dependencies to newer versions.
go.sum	Updates module checksums to match the bumped dependencies.
.github/workflows/nightly-tests.yaml	Adds Gateway API `v1.6.0-rc.1` lanes and updates guard logic for incompatible `v2.2.x` combinations.

Signed-off-by: David Jumani <[email protected]>

This reverts commit 48f6511. Signed-off-by: David Jumani <[email protected]>

Signed-off-by: David Jumani <[email protected]>

davidjumani · 2026-07-01T21:20:58Z

+	validListenersPerParent := map[string]int{}
+	for _, l := range validListeners {
+		// If the kind is missing, assume it is a gateway
+		kind := l.Parent.GetObjectKind().GroupVersionKind().Kind


Maybe type casting would be a better option ?

davidjumani · 2026-07-01T21:21:21Z

-func ListenerPort(listener ir.Listener, port gwv1.PortNumber) error {
+// When disableStatsOnProxy is true, port 9091 (the metrics port) is not considered reserved.
+func ListenerPort(listener ir.Listener, port gwv1.PortNumber, disableStatsOnProxy bool) error {
+	if disableStatsOnProxy && port == 9091 {


Maybe use a const ?

agree, unless we're reverting

davidjumani · 2026-07-02T13:56:07Z


+	// DisableStatsOnProxy disables the stats/metrics server on the Envoy proxy.
+	// When true, port 9091 is no longer reserved and listeners may use it.
+	DisableStatsOnProxy bool `split_words:"true" default:"false"`


Since the metrics port on the proxy (9091) conflicts with the port used in the conformance test, this flag has been introduced. This can either be kept or reverted in a follow-up with a custom script to set up conformance tests

revert and use gatewayClassParametersRefs with custom gwp

puertomontt · 2026-07-02T14:21:20Z

@@ -450,7 +450,7 @@ func (h *filterChainTranslator) computeTcpFilters(l ir.TcpIR, listenerReporter s
 		for _, route := range l.BackendRefs {
 			w := route.Weight
 			if w == 0 {
-				w = 1
+				continue


why this change

So TCP routes with a weight of 0 are not routed to. Required for TCPRouteWeightedRouting conformance test

this could generate invalid envoy config

If all the weights are intentionally 0 ?

puertomontt · 2026-07-02T14:36:49Z

+		// Do not set the timeout if retry is specified and only BackendRequest is set.
+		// This will be handled in envoyroutev3.RetryPolicy.PerTryTimeout
+		if !hasRetry {
+			timeout = timeouts.backendRequestTimeout
+		}


The backendRequestTimeout specifies the timeout for a response from the backend, not overall retry time which will be specified in the retry policy

puertomontt · 2026-07-02T14:43:35Z

 load("ext://uibutton", "cmd_button", "location")

-image_tag = "2.0.0-local"
+image_tag = "v1.0.1-dev"


sheidkamp · 2026-07-02T15:27:52Z

@@ -725,8 +735,8 @@ var _ = Describe("Translator TCPRoute Listener", func() {
 			newerStatus := rm.BuildRouteStatus(ctx, newerRoute, wellknown.DefaultGatewayControllerName)
 			Expect(newerStatus).NotTo(BeNil())
 			Expect(newerStatus.Parents).To(HaveLen(1))
-			newerAccepted := findAccepted(newerStatus.Parents[0].Conditions)
-			Expect(newerAccepted).NotTo(BeNil(), "Expected Accepted condition on newer route")
+			newerAccepted := findProgrammed(newerStatus.Parents[0].Conditions)


Nit: var says "Accepted", function gets "Programmed"

sheidkamp · 2026-07-02T15:28:07Z

+	validListenersPerParent := map[string]int{}
+	for _, l := range validListeners {
+		// If the kind is missing, assume it is a gateway
+		kind := l.Parent.GetObjectKind().GroupVersionKind().Kind


sheidkamp · 2026-07-02T15:29:04Z

-func ListenerPort(listener ir.Listener, port gwv1.PortNumber) error {
+// When disableStatsOnProxy is true, port 9091 (the metrics port) is not considered reserved.
+func ListenerPort(listener ir.Listener, port gwv1.PortNumber, disableStatsOnProxy bool) error {
+	if disableStatsOnProxy && port == 9091 {


agree, unless we're reverting

sheidkamp · 2026-07-02T15:30:44Z

@@ -104,19 +103,44 @@ func (c *CommonCollections) InitCollections(
 	httpRoutes := krt.WrapClient(kclient.NewFilteredDelayed[*gwv1.HTTPRoute](c.Client, wellknown.HTTPRouteGVR, filter), c.KrtOpts.ToOptions("HTTPRoute")...)
 	metrics.RegisterEvents(httpRoutes, kmetrics.GetResourceMetricEventHandler[*gwv1.HTTPRoute]())

-	// ON_EXPERIMENTAL_PROMOTION : Remove this block
-	// Ref: https://github.com/kgateway-dev/kgateway/issues/12879


Don't forget to close this issue!

chore: Bump gateway api to 1.6

ec9e1ef

Signed-off-by: David Jumani <[email protected]>

Copilot AI review requested due to automatic review settings June 12, 2026 18:56

Copilot started reviewing on behalf of davidjumani June 12, 2026 18:56 View session

Copilot AI reviewed Jun 12, 2026

View reviewed changes

Comment thread pkg/pluginsdk/collections/delayed_dynamic_informer.go

davidjumani added 15 commits June 12, 2026 15:03

more changes

d4c0131

Signed-off-by: David Jumani <[email protected]>

use promoted tcp route

48f6511

Signed-off-by: David Jumani <[email protected]>

fix conformance tests

0da83c6

Signed-off-by: David Jumani <[email protected]>

Revert "use promoted tcp route"

3f0c601

This reverts commit 48f6511. Signed-off-by: David Jumani <[email protected]>

fix GatewayListenerUnsupportedProtocol

f16e10d

Signed-off-by: David Jumani <[email protected]>

temp fix HTTPRouteNoBackendRefs

4007724

Signed-off-by: David Jumani <[email protected]>

exclude tests... for now

f941a13

Signed-off-by: David Jumani <[email protected]>

fix Tiltfile

d0a47af

Signed-off-by: David Jumani <[email protected]>

fix http retries

a9856f2

Signed-off-by: David Jumani <[email protected]>

fix TCPRouteWeightedRouting

48659f5

Signed-off-by: David Jumani <[email protected]>

Merge remote-tracking branch 'origin/main' into bump-gwapi-16

3a3e6ec

Signed-off-by: David Jumani <[email protected]>

more changes

5dfe569

Signed-off-by: David Jumani <[email protected]>

Merge remote-tracking branch 'origin/main' into bump-gwapi-16

650a108

Signed-off-by: David Jumani <[email protected]>

fix

d13c0fa

Signed-off-by: David Jumani <[email protected]>

more changes

1b56a6e

Signed-off-by: David Jumani <[email protected]>

davidjumani requested a review from a team as a code owner June 30, 2026 19:06

davidjumani added 2 commits June 30, 2026 15:13

fix

f675fe7

Signed-off-by: David Jumani <[email protected]>

fix incorrect condition

d457daa

Signed-off-by: David Jumani <[email protected]>

davidjumani added 3 commits June 30, 2026 17:48

more changes

3253c62

Signed-off-by: David Jumani <[email protected]>

Merge branch 'main' into bump-gwapi-16

16daf5c

bump timeouts

5b6d47e

Signed-off-by: David Jumani <[email protected]>

davidjumani commented Jun 30, 2026

View reviewed changes

Comment thread pkg/reports/status.go Outdated

davidjumani added 7 commits June 30, 2026 18:34

fix metric

2a5e2e2

Signed-off-by: David Jumani <[email protected]>

fix tests

5d795ee

Signed-off-by: David Jumani <[email protected]>

referesh golden

68b1b18

Signed-off-by: David Jumani <[email protected]>

fix unit tests

2ff4e6b

Signed-off-by: David Jumani <[email protected]>

Merge remote-tracking branch 'origin/main' into bump-gwapi-16

f8f03b5

Signed-off-by: David Jumani <[email protected]>

fix tcproutes on standard installs

279383f

Signed-off-by: David Jumani <[email protected]>

fix envtest version

fe8dad5

Signed-off-by: David Jumani <[email protected]>

davidjumani commented Jul 1, 2026

View reviewed changes

gateway-bot added kind/feature Categorizes issue or PR as related to a new feature. and removed kind/bump labels Jul 1, 2026

davidjumani changed the title ~~[WIP] chore: Bump gateway api to 1.6~~ chore: Bump gateway api to 1.6 Jul 1, 2026

davidjumani commented Jul 2, 2026

View reviewed changes

puertomontt reviewed Jul 2, 2026

View reviewed changes

puertomontt mentioned this pull request Jul 2, 2026

Use GatewayParameters to disable proxy stats #14345

Closed

puertomontt approved these changes Jul 2, 2026

View reviewed changes

puertomontt mentioned this pull request Jul 2, 2026

chore: remove DisableStatsOnProxy setting in favor of GatewayParameters for conformance #14346

Closed

howardjohn approved these changes Jul 2, 2026

View reviewed changes

davidjumani added this pull request to the merge queue Jul 2, 2026

sheidkamp reviewed Jul 2, 2026

View reviewed changes

Merged via the queue into main with commit ee899a1 Jul 2, 2026
44 of 46 checks passed

davidjumani deleted the bump-gwapi-16 branch July 2, 2026 15:56

puertomontt mentioned this pull request Jul 2, 2026

chore: replace DisableStatsOnProxy setting with GatewayParameters #14347

Closed

Uh oh!

Conversation

davidjumani commented Jun 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Change Type

Changelog

Additional Notes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

davidjumani commented Jun 12, 2026 •

edited

Loading