Merge pull request #19437 from liggitt/hpa-autoscaling-3.7-origin

Fix HPA scaling of deployment configs

Author: liggitt

pkg/apps/apis/apps/v1/types.go

@@ -11,8 +11,6 @@ import (
 // +genclient
 // +genclient:method=Instantiate,verb=create,subresource=instantiate,input=DeploymentRequest
 // +genclient:method=Rollback,verb=create,subresource=rollback,input=DeploymentConfigRollback
-// +genclient:method=GetScale,verb=get,subresource=scale,result=k8s.io/kubernetes/pkg/apis/extensions/v1beta1.Scale
-// +genclient:method=UpdateScale,verb=update,subresource=scale,input=k8s.io/kubernetes/pkg/apis/extensions/v1beta1.Scale,result=k8s.io/kubernetes/pkg/apis/extensions/v1beta1.Scale
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // Deployment Configs define the template for a pod and manages deploying new images or configuration changes.

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/apps/generated/clientset/typed/apps/v1/deploymentconfig.go

@@ -7,7 +7,6 @@ import (
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
 	rest "k8s.io/client-go/rest"
-	v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 )
 
 // DeploymentConfigsGetter has a method to return a DeploymentConfigInterface.
@@ -29,8 +28,6 @@ type DeploymentConfigInterface interface {
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.DeploymentConfig, err error)
 	Instantiate(deploymentConfigName string, deploymentRequest *v1.DeploymentRequest) (*v1.DeploymentConfig, error)
 	Rollback(deploymentConfigName string, deploymentConfigRollback *v1.DeploymentConfigRollback) (*v1.DeploymentConfig, error)
-	GetScale(deploymentConfigName string, options meta_v1.GetOptions) (*v1beta1.Scale, error)
-	UpdateScale(deploymentConfigName string, scale *v1beta1.Scale) (*v1beta1.Scale, error)
 
 	DeploymentConfigExpansion
 }
@@ -188,31 +185,3 @@ func (c *deploymentConfigs) Rollback(deploymentConfigName string, deploymentConf
 		Into(result)
 	return
 }
-
-// GetScale takes name of the deploymentConfig, and returns the corresponding v1beta1.Scale object, and an error if there is any.
-func (c *deploymentConfigs) GetScale(deploymentConfigName string, options meta_v1.GetOptions) (result *v1beta1.Scale, err error) {
-	result = &v1beta1.Scale{}
-	err = c.client.Get().
-		Namespace(c.ns).
-		Resource("deploymentconfigs").
-		Name(deploymentConfigName).
-		SubResource("scale").
-		VersionedParams(&options, scheme.ParameterCodec).
-		Do().
-		Into(result)
-	return
-}
-
-// UpdateScale takes the top resource name and the representation of a scale and updates it. Returns the server's representation of the scale, and an error, if there is any.
-func (c *deploymentConfigs) UpdateScale(deploymentConfigName string, scale *v1beta1.Scale) (result *v1beta1.Scale, err error) {
-	result = &v1beta1.Scale{}
-	err = c.client.Put().
-		Namespace(c.ns).
-		Resource("deploymentconfigs").
-		Name(deploymentConfigName).
-		SubResource("scale").
-		Body(scale).
-		Do().
-		Into(result)
-	return
-}

pkg/apps/generated/clientset/typed/apps/v1/fake/fake_deploymentconfig.go

@@ -8,7 +8,6 @@ import (
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
 	testing "k8s.io/client-go/testing"
-	v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 )
 
 // FakeDeploymentConfigs implements DeploymentConfigInterface
@@ -143,25 +142,3 @@ func (c *FakeDeploymentConfigs) Rollback(deploymentConfigName string, deployment
 	}
 	return obj.(*apps_v1.DeploymentConfig), err
 }
-
-// GetScale takes name of the deploymentConfig, and returns the corresponding deploymentConfig object, and an error if there is any.
-func (c *FakeDeploymentConfigs) GetScale(deploymentConfigName string, options v1.GetOptions) (result *v1beta1.Scale, err error) {
-	obj, err := c.Fake.
-		Invokes(testing.NewGetSubresourceAction(deploymentconfigsResource, c.ns, "scale", deploymentConfigName), &v1beta1.Scale{})
-
-	if obj == nil {
-		return nil, err
-	}
-	return obj.(*v1beta1.Scale), err
-}
-
-// UpdateScale takes the representation of a scale and updates it. Returns the server's representation of the scale, and an error, if there is any.
-func (c *FakeDeploymentConfigs) UpdateScale(deploymentConfigName string, scale *v1beta1.Scale) (result *v1beta1.Scale, err error) {
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateSubresourceAction(deploymentconfigsResource, "scale", c.ns, scale), &v1beta1.Scale{})
-
-	if obj == nil {
-		return nil, err
-	}
-	return obj.(*v1beta1.Scale), err
-}

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)