Remove route controllers

README.md

@@ -8,8 +8,6 @@ The controllers are generally organized by API group:
 - `build.openshift.io` - OpenShift `Builds` and `BuildConfigs`.
 - `image.openshift.io` - `ImageStreams` and `Images`.
 - `project.openshift.io` - Projects, OpenShift's wrapper for `Namespaces`.
-- `route.openshift.io` - OpenShift `Routes`, which provide similar capability to upstream `Ingress`
-  objects.
 - `template.openshift.io` - OpenShift `Templates` - a simple way to deploy applications.
 
 There are additional controllers which add OpenShift-specific capabilities to the cluster:

cmd/openshift-controller-manager/main.go

@@ -22,7 +22,6 @@ import (
 	"github.com/openshift/api/user"
 
 	openshift_controller_manager "github.com/openshift/openshift-controller-manager/pkg/cmd/openshift-controller-manager"
-	route_controller_manager "github.com/openshift/openshift-controller-manager/pkg/cmd/route-controller-manager"
 	"github.com/openshift/openshift-controller-manager/pkg/version"
 )
 
@@ -65,9 +64,5 @@ func NewOpenShiftControllerManagerCommand(stopCh <-chan struct{}) *cobra.Command
 	}
 	start := openshift_controller_manager.NewOpenShiftControllerManagerCommand("start", os.Stdout, os.Stderr, stopCh)
 	cmd.AddCommand(start)
-
-	routeStart := route_controller_manager.NewRouteControllerManagerCommand("route-controller-manager-start", os.Stdout, os.Stderr, stopCh)
-	cmd.AddCommand(routeStart)
-
 	return cmd
 }

pkg/cmd/controller/config.go

@@ -34,11 +34,8 @@ const (
 	infraDeployerControllerServiceAccountName                   = "deployer-controller"
 	infraImageTriggerControllerServiceAccountName               = "image-trigger-controller"
 	infraImageImportControllerServiceAccountName                = "image-import-controller"
-	infraSDNControllerServiceAccountName                        = "sdn-controller"
 	infraUnidlingControllerServiceAccountName                   = "unidling-controller"
-	infraServiceIngressIPControllerServiceAccountName           = "service-ingress-ip-controller"
 	infraDefaultRoleBindingsControllerServiceAccountName        = "default-rolebindings-controller"
-	infraIngressToRouteControllerServiceAccountName             = "ingress-to-route-controller"
 
 	// template instance controller watches for TemplateInstance object creation
 	// and instantiates templates as a result.

pkg/cmd/controller/interfaces.go

@@ -29,8 +29,6 @@ import (
 	imageinformer "github.com/openshift/client-go/image/informers/externalversions"
 	operatorclient "github.com/openshift/client-go/operator/clientset/versioned"
 	operatorinformer "github.com/openshift/client-go/operator/informers/externalversions"
-	routeclient "github.com/openshift/client-go/route/clientset/versioned"
-	routeinformer "github.com/openshift/client-go/route/informers/externalversions"
 	securityclient "github.com/openshift/client-go/security/clientset/versioned"
 	templateclient "github.com/openshift/client-go/template/clientset/versioned"
 	templateinformer "github.com/openshift/client-go/template/informers/externalversions"
@@ -80,10 +78,6 @@ func NewControllerContext(
 	if err != nil {
 		return nil, err
 	}
-	routerClient, err := routeclient.NewForConfig(clientConfig)
-	if err != nil {
-		return nil, err
-	}
 	templateClient, err := templateclient.NewForConfig(clientConfig)
 	if err != nil {
 		return nil, err
@@ -128,7 +122,6 @@ func NewControllerContext(
 		ConfigInformers:                    configinformer.NewSharedInformerFactory(configClient, defaultInformerResyncPeriod),
 		ImageInformers:                     imageinformer.NewSharedInformerFactory(imageClient, defaultInformerResyncPeriod),
 		OperatorInformers:                  operatorinformer.NewSharedInformerFactory(operatorClient, defaultInformerResyncPeriod),
-		RouteInformers:                     routeinformer.NewSharedInformerFactory(routerClient, defaultInformerResyncPeriod),
 		TemplateInformers:                  templateinformer.NewSharedInformerFactory(templateClient, defaultInformerResyncPeriod),
 		Stop:                               ctx.Done(),
 		Context:                            ctx,
@@ -153,7 +146,6 @@ type ControllerContext struct {
 	ControllerManagerKubeInformers     informers.SharedInformerFactory
 
 	TemplateInformers templateinformer.SharedInformerFactory
-	RouteInformers    routeinformer.SharedInformerFactory
 
 	AppsInformers     appsinformer.SharedInformerFactory
 	BuildInformers    buildinformer.SharedInformerFactory
@@ -185,7 +177,6 @@ func (c *ControllerContext) StartInformers(stopCh <-chan struct{}) {
 	c.ImageInformers.Start(stopCh)
 
 	c.TemplateInformers.Start(stopCh)
-	c.RouteInformers.Start(stopCh)
 	c.OperatorInformers.Start(stopCh)
 
 	c.informersStartedLock.Lock()