Move deployments to use versioned Kubernetes informers

Removes the need for an additional cache for these. Also all controllers
are moving in this direction anyway.

Author: smarterclayton

pkg/client/cache/deploymentconfig.go

@@ -5,7 +5,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	kapi "k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/v1"
 
 	deployapi "github.com/openshift/origin/pkg/deploy/api"
 	deployutil "github.com/openshift/origin/pkg/deploy/util"
@@ -27,7 +27,7 @@ func (s *StoreToDeploymentConfigLister) List() ([]*deployapi.DeploymentConfig, e
 }
 
 // GetConfigForController returns the managing deployment config for the provided replication controller.
-func (s *StoreToDeploymentConfigLister) GetConfigForController(rc *kapi.ReplicationController) (*deployapi.DeploymentConfig, error) {
+func (s *StoreToDeploymentConfigLister) GetConfigForController(rc *v1.ReplicationController) (*deployapi.DeploymentConfig, error) {
 	dcName := deployutil.DeploymentConfigNameFor(rc)
 	obj, exists, err := s.Indexer.GetByKey(rc.Namespace + "/" + dcName)
 	if err != nil {
@@ -40,7 +40,7 @@ func (s *StoreToDeploymentConfigLister) GetConfigForController(rc *kapi.Replicat
 }
 
 // GetConfigForPod returns the managing deployment config for the provided pod.
-func (s *StoreToDeploymentConfigLister) GetConfigForPod(pod *kapi.Pod) (*deployapi.DeploymentConfig, error) {
+func (s *StoreToDeploymentConfigLister) GetConfigForPod(pod *v1.Pod) (*deployapi.DeploymentConfig, error) {
 	dcName := deployutil.DeploymentConfigNameFor(pod)
 	obj, exists, err := s.Indexer.GetByKey(pod.Namespace + "/" + dcName)
 	if err != nil {

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

@@ -26,16 +26,15 @@ type DeploymentTriggerControllerConfig struct {
 }
 
 func (c *DeployerControllerConfig) RunController(ctx ControllerContext) (bool, error) {
-	internalDeployerKubeClient, err := ctx.ClientBuilder.KubeInternalClient(bootstrappolicy.InfraDeployerControllerServiceAccountName)
+	kubeClient, err := ctx.ClientBuilder.Client(bootstrappolicy.InfraDeployerControllerServiceAccountName)
 	if err != nil {
 		return true, err
 	}
 
 	go deployercontroller.NewDeployerController(
-		ctx.InternalKubeInformers.Core().InternalVersion().ReplicationControllers(),
-		ctx.InternalKubeInformers.Core().InternalVersion().Pods(),
-		internalDeployerKubeClient,
-		ctx.ClientBuilder.ClientOrDie(bootstrappolicy.InfraDeployerControllerServiceAccountName),
+		ctx.ExternalKubeInformers.Core().V1().ReplicationControllers(),
+		ctx.ExternalKubeInformers.Core().V1().Pods(),
+		kubeClient,
 		bootstrappolicy.DeployerServiceAccountName,
 		c.ImageName,
 		c.ClientEnvVars,
@@ -48,7 +47,7 @@ func (c *DeployerControllerConfig) RunController(ctx ControllerContext) (bool, e
 func (c *DeploymentConfigControllerConfig) RunController(ctx ControllerContext) (bool, error) {
 	saName := bootstrappolicy.InfraDeploymentConfigControllerServiceAccountName
 
-	internalDcKubeClient, err := ctx.ClientBuilder.KubeInternalClient(saName)
+	kubeClient, err := ctx.ClientBuilder.Client(saName)
 	if err != nil {
 		return true, err
 	}
@@ -59,10 +58,9 @@ func (c *DeploymentConfigControllerConfig) RunController(ctx ControllerContext)
 
 	go deployconfigcontroller.NewDeploymentConfigController(
 		ctx.AppInformers.Apps().InternalVersion().DeploymentConfigs().Informer(),
-		ctx.InternalKubeInformers.Core().InternalVersion().ReplicationControllers(),
+		ctx.ExternalKubeInformers.Core().V1().ReplicationControllers(),
 		deprecatedOcDcClient,
-		internalDcKubeClient,
-		ctx.ClientBuilder.ClientOrDie(saName),
+		kubeClient,
 		c.Codec,
 	).Run(5, ctx.Stop)
 
@@ -79,7 +77,7 @@ func (c *DeploymentTriggerControllerConfig) RunController(ctx ControllerContext)
 
 	go triggercontroller.NewDeploymentTriggerController(
 		ctx.AppInformers.Apps().InternalVersion().DeploymentConfigs().Informer(),
-		ctx.InternalKubeInformers.Core().InternalVersion().ReplicationControllers().Informer(),
+		ctx.ExternalKubeInformers.Core().V1().ReplicationControllers().Informer(),
 		ctx.ImageInformers.Image().InternalVersion().ImageStreams().Informer(),
 		deprecatedOcTriggerClient,
 		c.Codec,

pkg/controller/controller_ref_manager.go

@@ -11,8 +11,8 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	kutilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/client-go/tools/record"
-	kapi "k8s.io/kubernetes/pkg/api"
-	kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
+	"k8s.io/kubernetes/pkg/api/v1"
+	kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 	kcontroller "k8s.io/kubernetes/pkg/controller"
 )
 
@@ -86,15 +86,15 @@ func NewRCControllerRefManager(
 // If the error is nil, either the reconciliation succeeded, or no
 // reconciliation was necessary. The returned boolean indicates whether you now
 // own the object.
-func (m *RCControllerRefManager) ClaimReplicationController(rc *kapi.ReplicationController) (bool, error) {
+func (m *RCControllerRefManager) ClaimReplicationController(rc *v1.ReplicationController) (bool, error) {
 	match := func(obj kmetav1.Object) bool {
 		return m.Selector.Matches(klabels.Set(obj.GetLabels()))
 	}
 	adopt := func(obj kmetav1.Object) error {
-		return m.AdoptReplicationController(obj.(*kapi.ReplicationController))
+		return m.AdoptReplicationController(obj.(*v1.ReplicationController))
 	}
 	release := func(obj kmetav1.Object) error {
-		return m.ReleaseReplicationController(obj.(*kapi.ReplicationController))
+		return m.ReleaseReplicationController(obj.(*v1.ReplicationController))
 	}
 
 	return m.ClaimObject(rc, match, adopt, release)
@@ -113,8 +113,8 @@ func (m *RCControllerRefManager) ClaimReplicationController(rc *kapi.Replication
 // If the error is nil, either the reconciliation succeeded, or no
 // reconciliation was necessary. The list of ReplicationControllers that you now own is
 // returned.
-func (m *RCControllerRefManager) ClaimReplicationControllers(rcs []*kapi.ReplicationController) ([]*kapi.ReplicationController, error) {
-	var claimed []*kapi.ReplicationController
+func (m *RCControllerRefManager) ClaimReplicationControllers(rcs []*v1.ReplicationController) ([]*v1.ReplicationController, error) {
+	var claimed []*v1.ReplicationController
 	var errlist []error
 
 	for _, rc := range rcs {
@@ -132,7 +132,7 @@ func (m *RCControllerRefManager) ClaimReplicationControllers(rcs []*kapi.Replica
 
 // AdoptReplicationController sends a patch to take control of the ReplicationController. It returns the error if
 // the patching fails.
-func (m *RCControllerRefManager) AdoptReplicationController(rs *kapi.ReplicationController) error {
+func (m *RCControllerRefManager) AdoptReplicationController(rs *v1.ReplicationController) error {
 	if err := m.CanAdopt(); err != nil {
 		return fmt.Errorf("can't adopt ReplicationController %s/%s (%s): %v", rs.Namespace, rs.Name, rs.UID, err)
 	}
@@ -153,7 +153,7 @@ func (m *RCControllerRefManager) AdoptReplicationController(rs *kapi.Replication
 
 // ReleaseReplicationController sends a patch to free the ReplicationController from the control of the Deployment controller.
 // It returns the error if the patching fails. 404 and 422 errors are ignored.
-func (m *RCControllerRefManager) ReleaseReplicationController(rc *kapi.ReplicationController) error {
+func (m *RCControllerRefManager) ReleaseReplicationController(rc *v1.ReplicationController) error {
 	glog.V(4).Infof("patching ReplicationController %s/%s to remove its controllerRef to %s/%s:%s",
 		rc.Namespace, rc.Name, m.controllerKind.GroupVersion(), m.controllerKind.Kind, m.Controller.GetName())
 	deleteOwnerRefPatch := fmt.Sprintf(`{"metadata":{"ownerReferences":[{"$patch":"delete","uid":"%s"}],"uid":"%s"}}`, m.Controller.GetUID(), rc.UID)