Adds Support for GatewayClass SupportedVersion Condition #10140

danehans · 2024-10-01T17:56:40Z

Description

Previously, the gateway2 controller would unconditionally set the GatewayClass Accepted condition to True. This PR adds a watch for the Gateway API CRDs that triggers GatewayClass reconciliation. The ReconcileGatewayClasses() method was updated to set GatewayClass status conditions based on the Gateway API spec.

Fixes: #10092
Part Of: #10093

Testing steps

e2e test added
I also tested with [Conformance]: Adds GatewayClass SupportedVersion Test kubernetes-sigs/gateway-api#3368

Checklist:

I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
I have added tests that prove my fix is effective or that my feature works

BOT NOTES:
resolves solo-io#10092

solo-changelog-bot · 2024-10-01T17:56:52Z

Issues linked to changelog:
solo-io#10092

danehans · 2024-10-01T19:07:22Z

projects/gateway2/wellknown/gwapi.go

@@ -32,6 +32,10 @@ const (
 )

 var (
+	// SupportedVersions specifies the supported versions of Gateway API.
+	// [TODO] Remove "v1.0.0-rc1" when https://github.com/solo-io/gloo/issues/10115 is fixed.
+	SupportedVersions = []string{"v1.1.0", "v1.0.0", "v1.0.0-rc1"}


Note that v1.1.0 was added to this list due to solo-io#10121

cc @sam-heilbron - this is somewhat relevant to the conversation we've been having around ironing out our GW API support matrix.

danehans · 2024-10-03T00:09:29Z

CI is blocked by solo-io#10159.

sam-heilbron · 2024-10-03T15:47:45Z

@danehans A potential fix for that test failure has merged, and should unblock this work

projects/gateway2/controller/controller.go

test/kubernetes/e2e/features/gatewayclass/testdata/gatewayclass.yaml

projects/gateway2/crds/crds.go

test/kubernetes/e2e/features/gatewayclass/suite.go

timflannagan

LGTM - I think we can remove the 1.0.0-rc1 from the supported version list now that the issue you linked has been closed out. There's also some possible e2e test code refactoring that could be done here but I don't think it's worth pursuing if upstream decides to accept your conformance suite contribution.

danehans · 2024-10-04T17:02:10Z

@timflannagan I created solo-io#10174 to track the removal of rc1 from the list of approved CRD versions.

sam-heilbron

LGTM

sam-heilbron · 2024-10-11T15:49:14Z

projects/gateway2/controller/controller.go

+func (r *controllerReconciler) ReconcileCRDs(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	log := log.FromContext(ctx).WithValues("CustomResourceDefinition", req.Name)
+
+	log.Info("reconciling CustomResourceDefinition")


nit: Do you think this log line is useful at the info level? I wonder if this could just as easily be placed at the debug level

Good nit. Feels consistent with how the majority of the c-r reconcilers in the ecosystem are wired up imo. Let’s start here and dial back over time?

projects/gateway2/controller/controller.go

sam-heilbron · 2024-10-11T17:22:36Z

test/kubernetes/e2e/features/gatewayclass/types.go

+var (
+	gwParametersManifestFile  = filepath.Join(util.MustGetThisDir(), "testdata", "gatewayparameters.yaml")
+	gcManifestFile            = filepath.Join(util.MustGetThisDir(), "testdata", "gatewayclass.yaml")
+	supportedCrdsManifestFile = filepath.Join(util.MustGetThisDir(), "../../../../../projects/gateway2/crds", "gateway-crds.yaml")


nit: It feels like we could expose a method in the gateway2 project to return the absolute path to the gateway-crds file, and then just invoke it here

I symlinked testdata/gateway-crds.yaml to ../../../../../projects/gateway2/crds.

test/kubernetes/e2e/features/gatewayclass/types.go

Co-authored-by: Sam Heilbron <SamHeilbron@gmail.com> Co-authored-by: Ian Rudie <ilrudie@gmail.com>

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>

Previously, the gateway2 controller would unconditionally set the GatewayClass Accepted condition to `True`. This PR updates the CRD watcher to trigger GatewayClass reconciliation. The `ReconcileGatewayClasses()` method was updated to set GatewayClass status conditionas based on the Gateway API spec. Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>

danehans · 2024-11-21T22:11:41Z

kubernetes-sigs/gateway-api#3368 adds the conformance test upstream and has sparked debate of the viability of the SupportedVersion feature. /hold until the discussion is resolved.

danehans · 2025-01-06T23:21:33Z

Converting to draft since a rebase is required due to b545ea8 and /hold due to kubernetes-sigs/gateway-api#3368.

danehans mentioned this pull request Oct 1, 2024

[Conformance]: Adds GatewayClass SupportedVersion Test kubernetes-sigs/gateway-api#3368

Open

danehans force-pushed the issue_10092 branch from d234e90 to e9fe588 Compare October 1, 2024 18:53

danehans commented Oct 1, 2024

View reviewed changes

danehans mentioned this pull request Oct 3, 2024

TestMatchLabels Is Consistently Failing #10159

Closed

danehans force-pushed the issue_10092 branch from e9fe588 to 18aaa79 Compare October 3, 2024 16:04

danehans requested review from timflannagan and sam-heilbron October 3, 2024 17:25

timflannagan reviewed Oct 3, 2024

View reviewed changes

projects/gateway2/controller/controller.go Show resolved Hide resolved

timflannagan reviewed Oct 3, 2024

View reviewed changes

test/kubernetes/e2e/features/gatewayclass/testdata/gatewayclass.yaml Outdated Show resolved Hide resolved

timflannagan reviewed Oct 3, 2024

View reviewed changes

projects/gateway2/crds/crds.go Outdated Show resolved Hide resolved

timflannagan reviewed Oct 3, 2024

View reviewed changes

test/kubernetes/e2e/features/gatewayclass/suite.go Outdated Show resolved Hide resolved

danehans force-pushed the issue_10092 branch from 18aaa79 to 85dffd3 Compare October 3, 2024 20:59

danehans requested a review from timflannagan October 3, 2024 21:38

timflannagan approved these changes Oct 4, 2024

View reviewed changes

danehans mentioned this pull request Oct 4, 2024

Remove v1.0.0-rc1 From Approved CRD List #10174

Closed

danehans force-pushed the issue_10092 branch 2 times, most recently from 5c489b5 to 08baa71 Compare October 7, 2024 15:57

sam-heilbron reviewed Nov 11, 2024

View reviewed changes

Fix published Helm docs from main branch (kgateway-dev#10334)

82785b3

sam-heilbron added the work in progress signals bulldozer to keep pr open (don't auto-merge) label Nov 13, 2024

nfuden and others added 2 commits November 13, 2024 15:13

rename gloo edge -> k8sgateway (kgateway-dev#10336)

0037423

Co-authored-by: Sam Heilbron <SamHeilbron@gmail.com> Co-authored-by: Ian Rudie <ilrudie@gmail.com>

README.md: host images in repository (kgateway-dev#10338)

9dd3409

danehans force-pushed the issue_10092 branch from 08baa71 to b4b37d3 Compare November 14, 2024 01:16

README: support dark mode images (kgateway-dev#10339)

9a725c3

github-actions bot mentioned this pull request Nov 14, 2024

[Migrated] Adds Support for GatewayClass SupportedVersion Condition solo-io/gloo#10140

Closed

Fixes Legacy Gloo References (kgateway-dev#10341)

733a90f

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>

danehans force-pushed the issue_10092 branch from b4b37d3 to b9d8bdb Compare November 14, 2024 16:53

fix failing unit tests (kgateway-dev#10348)

0fe3e5a

danehans force-pushed the issue_10092 branch from b9d8bdb to b78e60d Compare November 14, 2024 17:16

danehans added 3 commits November 15, 2024 09:31

Regenerates Code from Repo Rename (kgateway-dev#10355)

131af7e

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>

Refactors initial commit

92a2238

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>

danehans force-pushed the issue_10092 branch from b78e60d to 92a2238 Compare November 15, 2024 18:42

yuval-k force-pushed the main branch from 5974a88 to b545ea8 Compare December 9, 2024 17:28

danehans marked this pull request as draft January 6, 2025 23:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds Support for GatewayClass SupportedVersion Condition #10140

Adds Support for GatewayClass SupportedVersion Condition #10140

danehans commented Oct 1, 2024 •

edited by solo-changelog-bot bot

Loading

solo-changelog-bot bot commented Oct 1, 2024

danehans Oct 1, 2024

timflannagan Oct 2, 2024

danehans commented Oct 3, 2024

sam-heilbron commented Oct 3, 2024

timflannagan left a comment

danehans commented Oct 4, 2024

sam-heilbron left a comment

sam-heilbron Oct 11, 2024

timflannagan Nov 12, 2024

sam-heilbron Oct 11, 2024

danehans Nov 15, 2024

danehans commented Nov 21, 2024

danehans commented Jan 6, 2025

Adds Support for GatewayClass SupportedVersion Condition #10140

Are you sure you want to change the base?

Adds Support for GatewayClass SupportedVersion Condition #10140

Conversation

danehans commented Oct 1, 2024 • edited by solo-changelog-bot bot Loading

Description

Testing steps

Checklist:

solo-changelog-bot bot commented Oct 1, 2024

danehans Oct 1, 2024

Choose a reason for hiding this comment

timflannagan Oct 2, 2024

Choose a reason for hiding this comment

danehans commented Oct 3, 2024

sam-heilbron commented Oct 3, 2024

timflannagan left a comment

Choose a reason for hiding this comment

danehans commented Oct 4, 2024

sam-heilbron left a comment

Choose a reason for hiding this comment

sam-heilbron Oct 11, 2024

Choose a reason for hiding this comment

timflannagan Nov 12, 2024

Choose a reason for hiding this comment

sam-heilbron Oct 11, 2024

Choose a reason for hiding this comment

danehans Nov 15, 2024

Choose a reason for hiding this comment

danehans commented Nov 21, 2024

danehans commented Jan 6, 2025

danehans commented Oct 1, 2024 •

edited by solo-changelog-bot bot

Loading