Use existing network informers from openshift controller context

pkg/cmd/server/origin/controller/interfaces.go

@@ -19,6 +19,7 @@ import (
 	buildclientinternal "github.com/openshift/origin/pkg/build/generated/internalclientset"
 	imageinformer "github.com/openshift/origin/pkg/image/generated/informers/internalversion"
 	imageclientinternal "github.com/openshift/origin/pkg/image/generated/internalclientset"
+	networkinformer "github.com/openshift/origin/pkg/network/generated/informers/internalversion"
 	networkclientinternal "github.com/openshift/origin/pkg/network/generated/internalclientset"
 	quotainformer "github.com/openshift/origin/pkg/quota/generated/informers/internalversion"
 	quotaclient "github.com/openshift/origin/pkg/quota/generated/internalclientset"
@@ -41,6 +42,7 @@ type ControllerContext struct {
 	AppInformers            appinformer.SharedInformerFactory
 	BuildInformers          buildinformer.SharedInformerFactory
 	ImageInformers          imageinformer.SharedInformerFactory
+	NetworkInformers        networkinformer.SharedInformerFactory
 	TemplateInformers       templateinformer.SharedInformerFactory
 	QuotaInformers          quotainformer.SharedInformerFactory
 	AuthorizationInformers  authorizationinformer.SharedInformerFactory

pkg/cmd/server/origin/controller/network_sdn.go

@@ -3,12 +3,9 @@ package controller
 import (
 	"fmt"
 
-	utilwait "k8s.io/apimachinery/pkg/util/wait"
-
 	configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 	"github.com/openshift/origin/pkg/network"
-	networkinformers "github.com/openshift/origin/pkg/network/generated/informers/internalversion"
 	sdnmaster "github.com/openshift/origin/pkg/network/master"
 )
 
@@ -21,20 +18,15 @@ func (c *SDNControllerConfig) RunController(ctx ControllerContext) (bool, error)
 		return false, nil
 	}
 
-	networkClient := ctx.ClientBuilder.OpenshiftInternalNetworkClientOrDie(bootstrappolicy.InfraSDNControllerServiceAccountName)
-	networkInformers := networkinformers.NewSharedInformerFactory(networkClient, network.DefaultInformerResyncPeriod)
-
 	if err := sdnmaster.Start(
 		c.NetworkConfig,
-		networkClient,
+		ctx.ClientBuilder.OpenshiftInternalNetworkClientOrDie(bootstrappolicy.InfraSDNControllerServiceAccountName),
 		ctx.ClientBuilder.KubeInternalClientOrDie(bootstrappolicy.InfraSDNControllerServiceAccountName),
 		ctx.InternalKubeInformers,
-		networkInformers,
+		ctx.NetworkInformers,
 	); err != nil {
 		return false, fmt.Errorf("failed to start SDN plugin controller: %v", err)
 	}
 
-	networkInformers.Start(utilwait.NeverStop)
-
 	return true, nil
 }

pkg/cmd/server/origin/informers.go

@@ -15,8 +15,6 @@ import (
 	kinternalinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion"
 
 	"github.com/golang/glog"
-	networkclient "github.com/openshift/client-go/network/clientset/versioned"
-	networkinformer "github.com/openshift/client-go/network/informers/externalversions"
 	routeclient "github.com/openshift/client-go/route/clientset/versioned"
 	routeinformer "github.com/openshift/client-go/route/informers/externalversions"
 	userclient "github.com/openshift/client-go/user/clientset/versioned"
@@ -31,6 +29,8 @@ import (
 	configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
 	imageinformer "github.com/openshift/origin/pkg/image/generated/informers/internalversion"
 	imageclient "github.com/openshift/origin/pkg/image/generated/internalclientset"
+	networkinformer "github.com/openshift/origin/pkg/network/generated/informers/internalversion"
+	networkclient "github.com/openshift/origin/pkg/network/generated/internalclientset"
 	oauthinformer "github.com/openshift/origin/pkg/oauth/generated/informers/internalversion"
 	oauthclient "github.com/openshift/origin/pkg/oauth/generated/internalclientset"
 	quotainformer "github.com/openshift/origin/pkg/quota/generated/informers/internalversion"

pkg/cmd/server/origin/master_config.go

@@ -38,6 +38,7 @@ import (
 	imageadmission "github.com/openshift/origin/pkg/image/admission"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	imageinformer "github.com/openshift/origin/pkg/image/generated/informers/internalversion"
+	networkinformer "github.com/openshift/origin/pkg/network/generated/informers/internalversion"
 	oauthinformer "github.com/openshift/origin/pkg/oauth/generated/informers/internalversion"
 	projectauth "github.com/openshift/origin/pkg/project/auth"
 	projectcache "github.com/openshift/origin/pkg/project/cache"
@@ -107,6 +108,7 @@ type InformerAccess interface {
 	GetAuthorizationInformers() authorizationinformer.SharedInformerFactory
 	GetBuildInformers() buildinformer.SharedInformerFactory
 	GetImageInformers() imageinformer.SharedInformerFactory
+	GetNetworkInformers() networkinformer.SharedInformerFactory
 	GetOauthInformers() oauthinformer.SharedInformerFactory
 	GetQuotaInformers() quotainformer.SharedInformerFactory
 	GetSecurityInformers() securityinformer.SharedInformerFactory

pkg/cmd/server/start/controllers.go

@@ -60,6 +60,7 @@ func newControllerContext(
 		AuthorizationInformers:  informers.GetAuthorizationInformers(),
 		BuildInformers:          informers.GetBuildInformers(),
 		ImageInformers:          informers.GetImageInformers(),
+		NetworkInformers:        informers.GetNetworkInformers(),
 		QuotaInformers:          informers.GetQuotaInformers(),
 		SecurityInformers:       informers.GetSecurityInformers(),
 		TemplateInformers:       informers.GetTemplateInformers(),