Use internal client for scaling

Author: liggitt

pkg/apps/client/v1/scale.go

@@ -5,7 +5,7 @@ import (
 	extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	kextensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1"
 
-	appstypedclient "github.com/openshift/origin/pkg/apps/generated/clientset/typed/apps/v1"
+	appstypedclient "github.com/openshift/origin/pkg/apps/generated/internalclientset/typed/apps/internalversion"
 )
 
 type delegatingScaleInterface struct {

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

@@ -7,7 +7,7 @@ import (
 	hpametrics "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics"
 
 	appsv1client "github.com/openshift/origin/pkg/apps/client/v1"
-	appstypedclient "github.com/openshift/origin/pkg/apps/generated/clientset/typed/apps/v1"
+	appstypedclient "github.com/openshift/origin/pkg/apps/generated/internalclientset/typed/apps/internalversion"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 )
 

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

@@ -4,7 +4,7 @@ import (
 	"time"
 
 	appsv1client "github.com/openshift/origin/pkg/apps/client/v1"
-	appstypedclient "github.com/openshift/origin/pkg/apps/generated/clientset/typed/apps/v1"
+	appstypedclient "github.com/openshift/origin/pkg/apps/generated/internalclientset/typed/apps/internalversion"
 	deployclient "github.com/openshift/origin/pkg/apps/generated/internalclientset/typed/apps/internalversion"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 	unidlingcontroller "github.com/openshift/origin/pkg/unidling/controller"

pkg/oc/cli/cmd/idle.go

@@ -25,7 +25,7 @@ import (
 
 	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
 	appsmanualclient "github.com/openshift/origin/pkg/apps/client/v1"
-	appsv1client "github.com/openshift/origin/pkg/apps/generated/clientset/typed/apps/v1"
+	appstypedclient "github.com/openshift/origin/pkg/apps/generated/internalclientset/typed/apps/internalversion"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 	unidlingapi "github.com/openshift/origin/pkg/unidling/api"
 	utilunidling "github.com/openshift/origin/pkg/unidling/util"
@@ -546,13 +546,13 @@ func (o *IdleOptions) RunIdle(f *clientcmd.Factory) error {
 	if err != nil {
 		return err
 	}
-	appsV1Client, err := appsv1client.NewForConfig(clientConfig)
+	appsInternalClient, err := appstypedclient.NewForConfig(clientConfig)
 	if err != nil {
 		return err
 	}
 
 	externalKubeExtensionClient := kextensionsclient.New(kclient.Core().RESTClient())
-	delegScaleGetter := appsmanualclient.NewDelegatingScaleNamespacer(appsV1Client, externalKubeExtensionClient)
+	delegScaleGetter := appsmanualclient.NewDelegatingScaleNamespacer(appsInternalClient, externalKubeExtensionClient)
 	scaleAnnotater := utilunidling.NewScaleAnnotater(delegScaleGetter, appClient.Apps(), kclient.Core(), func(currentReplicas int32, annotations map[string]string) {
 		annotations[unidlingapi.IdledAtAnnotation] = nowTime.UTC().Format(time.RFC3339)
 		annotations[unidlingapi.PreviousScaleAnnotation] = fmt.Sprintf("%v", currentReplicas)