Gateway API: add support for ReferenceGrant (#4580)

Adds support for the renamed ReferenceGrant resource while retaining support for ReferencePolicy, to allow for a seamless migration. ReferencePolicy support will be removed in a subsequent release. Updates #4555. Signed-off-by: Steve Kriss <krisss@vmware.com>
projectcontour · Jun 16, 2022 · c74c33a · c74c33a
1 parent 485238e
commit c74c33a
Show file tree

Hide file tree

Showing 17 changed files with 156 additions and 93 deletions.
diff --git a/changelogs/unreleased/4580-skriss-deprecation.md b/changelogs/unreleased/4580-skriss-deprecation.md
@@ -0,0 +1,5 @@
+## Gateway API: ReferencePolicy is deprecated, will be removed next release
+
+Gateway API has renamed ReferencePolicy to ReferenceGrant in the v0.5.0 release, while retaining the former for one release to ease migration.
+Contour currently supports both, but will drop support for ReferencePolicy in the next release.
+Users of ReferencePolicies must migrate their resources to ReferenceGrants ahead of the next Contour release.
diff --git a/changelogs/unreleased/4580-skriss-small.md b/changelogs/unreleased/4580-skriss-small.md
@@ -0,0 +1 @@
+Gateway API: adds support for ReferenceGrant, which was formerly known as ReferencePolicy. To ease migration, _both_ resources are supported for this release, but ReferencePolicy support will be removed next release.
diff --git a/cmd/contour/serve.go b/cmd/contour/serve.go
@@ -809,6 +809,11 @@ func (s *Server) setupGatewayAPI(contourConfiguration contour_api_v1alpha1.Conto
 			s.log.WithError(err).WithField("resource", "referencepolicies").Fatal("failed to create informer")
 		}
 
+		// Inform on ReferenceGrants.
+		if err := informOnResource(&gatewayapi_v1alpha2.ReferenceGrant{}, eventHandler, mgr.GetCache()); err != nil {
+			s.log.WithError(err).WithField("resource", "referencegrants").Fatal("failed to create informer")
+		}
+
 		// Inform on Namespaces.
 		if err := informOnResource(&corev1.Namespace{}, eventHandler, mgr.GetCache()); err != nil {
 			s.log.WithError(err).WithField("resource", "namespaces").Fatal("failed to create informer")

diff --git a/examples/contour/02-role-contour.yaml b/examples/contour/02-role-contour.yaml
@@ -26,6 +26,7 @@ rules:
   - gatewayclasses
   - gateways
   - httproutes
+  - referencegrants
   - referencepolicies
   - tlsroutes
   verbs:

diff --git a/examples/gateway-provisioner/01-roles.yaml b/examples/gateway-provisioner/01-roles.yaml
@@ -76,6 +76,7 @@ rules:
   - gatewayclasses
   - gateways
   - httproutes
+  - referencegrants
   - referencepolicies
   - tlsroutes
   verbs:

diff --git a/examples/render/contour-deployment.yaml b/examples/render/contour-deployment.yaml
@@ -4852,6 +4852,7 @@ rules:
   - gatewayclasses
   - gateways
   - httproutes
+  - referencegrants
   - referencepolicies
   - tlsroutes
   verbs:

diff --git a/examples/render/contour-gateway-provisioner.yaml b/examples/render/contour-gateway-provisioner.yaml
@@ -11626,6 +11626,7 @@ rules:
   - gatewayclasses
   - gateways
   - httproutes
+  - referencegrants
   - referencepolicies
   - tlsroutes
   verbs:

diff --git a/examples/render/contour-gateway.yaml b/examples/render/contour-gateway.yaml
@@ -4857,6 +4857,7 @@ rules:
   - gatewayclasses
   - gateways
   - httproutes
+  - referencegrants
   - referencepolicies
   - tlsroutes
   verbs:

diff --git a/examples/render/contour.yaml b/examples/render/contour.yaml
@@ -4852,6 +4852,7 @@ rules:
   - gatewayclasses
   - gateways
   - httproutes
+  - referencegrants
   - referencepolicies
   - tlsroutes
   verbs:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Gateway API: adds support for ReferenceGrant, which was formerly known as ReferencePolicy. To ease migration, _both_ resources are supported for this release, but ReferencePolicy support will be removed next release.