gateway-api: update to v0.5.0 and v1beta1 resources #224

mikemorris · 2022-06-13T19:08:23Z

Changes proposed in this PR:

Update to gateway-api@master
- This should be updated to gateway-api@v0.5.0-rc1 when available
- ~~Before merging, this should be updated to gateway-api@v0.5.0~~
  - This is anticipated to happen within the next two weeks and can happen in a followup PR to avoid this getting too stale
~~Update all v1alpha1 references to v1alpha2 if not graduated to v1beta1 yet~~
- N/A, all the v1alpha1 references I had noticed while skimming through were actually for "github.com/hashicorp/consul-api-gateway/pkg/apis/v1alpha1"
Update to graduated v1beta1 resources
- Deferring v1beta1 for HTTPRoute for now due to the complications of shared logic with other route types still on v1alpha2
Enable support for deprecated ReferencePolicy
- Blocked pending restoration in Adding back ReferencePolicy with a note that it will be removed in v0.6.0 kubernetes-sigs/gateway-api#1205

How I've tested this PR:

Code compiles, tests are passing

Notes for reviewers:

The go.mod updates to k8s.io modules are due to deps: update k8s.io modules to v0.24 kubernetes-sigs/gateway-api#1199 which switches from googleapis/gnostic to google/gnostic - this was handled in Update kubectl kustomize to v4.5.4 kubernetes/kubernetes#108994 to resolve the dependency conflict, but requires updating all dependencies in lockstep
The internal/k8s/logger.go changes are to adapt to the breaking change in Rearch for performance: BREAKING CHANGES go-logr/logr#42 hit due to the dependency bump to go-logr/logr from updating the Kubernetes ecosystem libraries
Rebased and reordered so this should be relatively reasonable to review by commit now.
I may attempt to migrate HTTPRoute to v1beta1 in a future PR, but that was significantly complicating this PR due to mixed versioned types in helper function arguments and returns (e.g. returning either v1beta1.CommonRouteSpec or v1alpha2.CommonRouteSpec depending on the route type) - wanted to keep that out of scope for now to avoid excessive complexity/refactoring.

How I expect reviewers to test this PR:

Verify that the changes seems sensible and nothing was missed.

Checklist:

Tests added for ReferencePolicy backwards compatibility support
- ~~Gateway controller certificateRefs~~
- HTTPRoute controller
- TCPRoute controller
- ~~e2e~~
CHANGELOG entry added

Run make changelog-entry for guidance in authoring a changelog entry, and
commit the resulting file, which should have a name matching your PR number.
Entries should use imperative present tense (e.g. Add support for...)

internal/k8s/reconciler/utils_test.go

mikemorris · 2022-06-16T22:11:59Z

Moving internal/k8s/reconciler/route.go and internal/k8s/service/resolver.go is looking like it's gonna be a bit of extra work (possibly using generics, hopefully avoiding too much copy/pasting) due to how we have quite a bit of shared functionality that will need to work with both v1beta1 shared types (like BackendRef and ParentRefernce) for v1beta1.HTTPRoute and v1alpha2 shared types for v1alpha2.TCPRoute 😢

mikemorris · 2022-06-20T21:43:39Z

config/crd/kustomization.yaml

@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

 resources:
- github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.4.1
+- github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v0.5.0-rc1
+- https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v0.5.0-rc1/config/crd/experimental/gateway.networking.k8s.io_referencepolicies.yaml


Needed to be installed explicitly because kustomize seems to omit the ReferencePolicies CRD by default due to it being marked deprecated: true. Remote resource install refs kubernetes-sigs/kustomize#970 (comment)

nathancoleman

This is looking good! Would like to get merged this week to let it bake for as long as possible while we build up to our v0.4.0 release.

I haven't done so yet but want to make sure we have a ticket for upgrading HTTPRoute to v1beta1. It seems like something we could easily overlook ahead of our release if we don't, and I'd like to be as up-to-date as possible with kubernetes-sigs/gateway-api by our next release.

.changelog/224.txt

nathancoleman · 2022-06-27T21:37:29Z

.github/workflows/conformance.yml

+        uses: actions/checkout@v2
+        with:
+          repository: "hashicorp/consul-k8s"
+          ref: "charts/capigw-controller-clusterrole-referencegrants"


Note: this branch is from hashicorp/consul-k8s#1299

Since the PR above is so small, it'd be nice if we could merge it first and then have this PR reference main.

Closing the loop: hashicorp/consul-k8s#1299 (comment) resulted in the conclusion that we don't want to merge the above PR just yet.

Are you thinking we move ahead with this PR and just leave the with.ref pointed at the branch above @mikemorris ?

Yea, I think that could be reasonable to avoid this getting stale, will open an issue tracking that so we don't forget.

.github/workflows/conformance.yml

dev/run

internal/k8s/utils/reference.go

mikemorris · 2022-06-29T17:39:14Z

ReferencePolicy backwards compatibility will need an update to account for fix ReferencePolicyList.Items type kubernetes-sigs/gateway-api#1239 after that change is included in a Gateway API release
- Add the remaining tests for ReferencePolicy backwards compatibility (Gateway certificateRefs and e2e) alongside this change
  - referencepolicy: finish backwards compatibility support and tests #293

internal/k8s/utils/reference.go

…eded

…ointer

to match envtest requirements

k8s/controllers: minor refactor and mocking up future ReferencePolicy support for backwards compatibility k8s/gatewayclient: regenerate mocks after ReferenceGrant rename docs: update supported-features.md for ReferenceGrant k8s/controller: update http and tcp route controller tests for ReferenceGrant k8s/reconciler: update listener test for ReferenceGrant k8s/reconciler: update route test for ReferenceGrant e2e: update ReferencePolicy -> ReferenceGrant k8s/reconciler: update utils test for ReferenceGrant k8s/reconciler: update statuses for ReferenceGrant rbac: add gateway controller permissions to read ReferenceGrants

… CRDs e2e: rename kubectlKustomizeCRDs arg from url to path

e2e/kubernetes: add v1beta1 known types separately from v1alpha2 known types

…tes and ReferenceGrant gateway-api: add ReferencePolicy backwards compatibility support mocks: regenerate k8s/controller: add gwv1alpha2 to scheme k8s/gatewayclient: add gwv1alpha2 to scheme for test helpers

…ranch

nathancoleman

Just the one last thing; otherwise LGTM

.github/workflows/conformance.yml

.github/workflows/conformance_with_build.yml

mikemorris commented Jun 13, 2022

View reviewed changes

internal/k8s/reconciler/utils_test.go Show resolved Hide resolved

mikemorris force-pushed the gateway-api/v0.5-v1beta1 branch from 0e311a5 to b5f685e Compare June 16, 2022 19:27

mikemorris force-pushed the gateway-api/v0.5-v1beta1 branch 7 times, most recently from bc5ce1f to 40c4b64 Compare June 20, 2022 16:09

mikemorris commented Jun 20, 2022

View reviewed changes

mikemorris added the pr/run-conformance label Jun 20, 2022

mikemorris marked this pull request as ready for review June 20, 2022 21:48

mikemorris requested a review from a team June 20, 2022 21:48

mikemorris added do not merge theme/k8s-gateway-api Related to the Kubernetes Gateway API standard labels Jun 20, 2022

mikemorris mentioned this pull request Jun 21, 2022

charts: add ReferenceGrant permissions to Consul API Gateway ClusterRole hashicorp/consul-k8s#1299

Merged

2 tasks

mikemorris force-pushed the gateway-api/v0.5-v1beta1 branch from 6ddb9b4 to 3375eb3 Compare June 21, 2022 20:48

nathancoleman suggested changes Jun 27, 2022

View reviewed changes

mikemorris commented Jun 29, 2022

View reviewed changes

internal/k8s/utils/reference.go Outdated Show resolved Hide resolved

mikemorris and others added 9 commits June 29, 2022 17:22

deps: bump gateway-api to sigs.k8s.io/gateway-api@v0.5.0-rc1

b4eafec

gateway-api: update ParentRef -> ParentReference

086387d

k8s: update Handler->ProbeHandler for compat with v0.23+

19578a0

k8s/reconciler: deref for l.listener.TLS.CertificateRefs no longer ne…

5caf5c8

…eded

k8s/logger: reimplement k8s logger as LogSink

62e08a3

gateway-api: update CertificateRefs to []SecretObjectReference from p…

171e10e

…ointer

e2e: update readCRDs signature to return []*api.CustomResourceDefinition

25c3fbc

to match envtest requirements

changelog: add entry for gateway-api@v0.5.0

d5c2691

mikemorris added 4 commits June 29, 2022 17:22

config/crd: install Gateway API experimental channel CRDs

63e14f6

dev/run: install CRDs from config/crd

daa9b02

e2e/kubernetes: install Consul API Gateway CRDs alongside Gateway API…

1c5e804

… CRDs e2e: rename kubectlKustomizeCRDs arg from url to path

e2e: import both Gateway API v1alpha2 and v1beta1, split usage

18c457f

e2e/kubernetes: add v1beta1 known types separately from v1alpha2 known types

mikemorris force-pushed the gateway-api/v0.5-v1beta1 branch from 1e24ace to 7b158cd Compare June 29, 2022 21:32

mikemorris added 3 commits June 29, 2022 17:49

k8s: move Gateway API usage to v1beta1 or explicitly v1alpha2 for Rou…

6bbb804

…tes and ReferenceGrant gateway-api: add ReferencePolicy backwards compatibility support mocks: regenerate k8s/controller: add gwv1alpha2 to scheme k8s/gatewayclient: add gwv1alpha2 to scheme for test helpers

config/crd: install deprecated ReferencePolicies CRD explicitly

6fee687

ci: clone consul-k8s repo and install Consul Helm chart from custom b…

09fede1

…ranch

mikemorris force-pushed the gateway-api/v0.5-v1beta1 branch from 8f2ac73 to 09fede1 Compare June 29, 2022 21:49

This was referenced Jul 1, 2022

Bump k8s.io/api from 0.22.1 to 0.24.2 #253

Closed

Bump k8s.io/apimachinery from 0.22.1 to 0.24.2 #257

Closed

nathancoleman suggested changes Jul 1, 2022

View reviewed changes

.github/workflows/conformance.yml Outdated Show resolved Hide resolved

mikemorris commented Jul 1, 2022

View reviewed changes

.github/workflows/conformance.yml Outdated Show resolved Hide resolved

mikemorris commented Jul 1, 2022

View reviewed changes

.github/workflows/conformance_with_build.yml Outdated Show resolved Hide resolved

mikemorris commented Jul 1, 2022

View reviewed changes

.github/workflows/conformance_with_build.yml Outdated Show resolved Hide resolved

Apply suggestions from code review

04935cd

nathancoleman approved these changes Jul 1, 2022

View reviewed changes

mikemorris merged commit 38dc955 into main Jul 1, 2022

mikemorris deleted the gateway-api/v0.5-v1beta1 branch July 1, 2022 16:39

mikemorris mentioned this pull request Jul 1, 2022

conformance: skip failing tests #205

Closed

2 tasks

mikemorris mentioned this pull request Jul 19, 2022

Restore inclusion of ReferencePolicy in Grant lookup #280

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gateway-api: update to v0.5.0 and v1beta1 resources #224

gateway-api: update to v0.5.0 and v1beta1 resources #224

mikemorris commented Jun 13, 2022 •

edited

mikemorris commented Jun 16, 2022 •

edited

mikemorris Jun 20, 2022

nathancoleman left a comment •

edited

nathancoleman Jun 27, 2022 •

edited

nathancoleman Jun 27, 2022

nathancoleman Jul 1, 2022

mikemorris Jul 1, 2022

mikemorris commented Jun 29, 2022 •

edited

nathancoleman left a comment •

edited

gateway-api: update to v0.5.0 and v1beta1 resources #224

gateway-api: update to v0.5.0 and v1beta1 resources #224

Conversation

mikemorris commented Jun 13, 2022 • edited

Changes proposed in this PR:

How I've tested this PR:

Notes for reviewers:

How I expect reviewers to test this PR:

Checklist:

mikemorris commented Jun 16, 2022 • edited

mikemorris Jun 20, 2022

Choose a reason for hiding this comment

nathancoleman left a comment • edited

Choose a reason for hiding this comment

nathancoleman Jun 27, 2022 • edited

Choose a reason for hiding this comment

nathancoleman Jun 27, 2022

Choose a reason for hiding this comment

nathancoleman Jul 1, 2022

Choose a reason for hiding this comment

mikemorris Jul 1, 2022

Choose a reason for hiding this comment

mikemorris commented Jun 29, 2022 • edited

nathancoleman left a comment • edited

Choose a reason for hiding this comment

mikemorris commented Jun 13, 2022 •

edited

mikemorris commented Jun 16, 2022 •

edited

nathancoleman left a comment •

edited

nathancoleman Jun 27, 2022 •

edited

mikemorris commented Jun 29, 2022 •

edited

nathancoleman left a comment •

edited