Skip to content

Commit

Permalink
drop TCPRoute/UDPRoute controllers and RBAC
Browse files Browse the repository at this point in the history
With this PR, Contour no longer watches
TCPRoutes or UDPRoutes, and does not set
an "Accepted: false" condition on them.
All RBAC related to them is dropped as well.

Closes projectcontour#4156.

Signed-off-by: Steve Kriss <krisss@vmware.com>
  • Loading branch information
skriss committed Nov 9, 2021
1 parent 6d78450 commit 683a8d6
Show file tree
Hide file tree
Showing 11 changed files with 5 additions and 619 deletions.
1 change: 0 additions & 1 deletion changelogs/unreleased/4143-skriss-small.md

This file was deleted.

20 changes: 0 additions & 20 deletions cmd/contour/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -694,26 +694,6 @@ func (s *Server) setupGatewayAPI(contourConfiguration contour_api_v1alpha1.Conto
s.log.WithError(err).Fatal("failed to create tlsroute-controller")
}

// Create and register the TCPRoute controller with the manager.
if _, err := controller.NewTCPRouteController(
mgr,
sh.Writer(),
gatewayClassControllerName,
s.log.WithField("context", "tcproute-controller"),
); err != nil {
s.log.WithError(err).Fatal("failed to create tcproute-controller")
}

// Create and register the UDPRoute controller with the manager.
if _, err := controller.NewUDPRouteController(
mgr,
sh.Writer(),
gatewayClassControllerName,
s.log.WithField("context", "udproute-controller"),
); err != nil {
s.log.WithError(err).Fatal("failed to create udproute-controller")
}

// Inform on ReferencePolicies.
if err := informOnResource(&gatewayapi_v1alpha2.ReferencePolicy{}, eventHandler, mgr.GetCache()); err != nil {
s.log.WithError(err).WithField("resource", "referencepolicies").Fatal("failed to create informer")
Expand Down
4 changes: 0 additions & 4 deletions examples/contour/02-role-contour.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ rules:
- gateways
- httproutes
- referencepolicies
- tcproutes
- tlsroutes
- udproutes
verbs:
- get
- list
Expand All @@ -48,9 +46,7 @@ rules:
- gatewayclasses/status
- gateways/status
- httproutes/status
- tcproutes/status
- tlsroutes/status
- udproutes/status
verbs:
- update
- apiGroups:
Expand Down
7 changes: 3 additions & 4 deletions examples/render/contour-gateway.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4836,9 +4836,7 @@ rules:
- gateways
- httproutes
- referencepolicies
- tcproutes
- tlsroutes
- udproutes
verbs:
- get
- list
Expand All @@ -4849,9 +4847,7 @@ rules:
- gatewayclasses/status
- gateways/status
- httproutes/status
- tcproutes/status
- tlsroutes/status
- udproutes/status
verbs:
- update
- apiGroups:
Expand Down Expand Up @@ -8926,5 +8922,8 @@ spec:
protocol: HTTP
port: 80
allowedRoutes:
kinds:
- kind: HTTPRoute
- kind: TLSRoute
namespaces:
from: All
4 changes: 0 additions & 4 deletions examples/render/contour.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4833,9 +4833,7 @@ rules:
- gateways
- httproutes
- referencepolicies
- tcproutes
- tlsroutes
- udproutes
verbs:
- get
- list
Expand All @@ -4846,9 +4844,7 @@ rules:
- gatewayclasses/status
- gateways/status
- httproutes/status
- tcproutes/status
- tlsroutes/status
- udproutes/status
verbs:
- update
- apiGroups:
Expand Down
208 changes: 0 additions & 208 deletions internal/controller/tcproute.go

This file was deleted.

Loading

0 comments on commit 683a8d6

Please sign in to comment.