diff --git a/pkg/apps/apis/apps/types.go b/pkg/apps/apis/apps/types.go index 5feffa507ff6..daaf606c5210 100644 --- a/pkg/apps/apis/apps/types.go +++ b/pkg/apps/apis/apps/types.go @@ -138,7 +138,6 @@ const ( // +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/api/extensions/v1beta1.Scale -// +genclient:method=UpdateScale,verb=update,subresource=scale,input=k8s.io/api/extensions/v1beta1.Scale,result=k8s.io/api/extensions/v1beta1.Scale // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // DeploymentConfig represents a configuration for a single deployment (represented as a diff --git a/pkg/apps/generated/internalclientset/scheme/register_expansion.go b/pkg/apps/generated/internalclientset/scheme/register_expansion.go new file mode 100644 index 000000000000..e7824a2830ce --- /dev/null +++ b/pkg/apps/generated/internalclientset/scheme/register_expansion.go @@ -0,0 +1,10 @@ +package scheme + +import ( + extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" +) + +func init() { + // Needed for GetScale/UpdateScale + extensionsv1beta1.AddToScheme(Scheme) +} diff --git a/pkg/apps/generated/internalclientset/typed/apps/internalversion/deploymentconfig.go b/pkg/apps/generated/internalclientset/typed/apps/internalversion/deploymentconfig.go index 669e07d3b2c3..6c9ba5d9b14a 100644 --- a/pkg/apps/generated/internalclientset/typed/apps/internalversion/deploymentconfig.go +++ b/pkg/apps/generated/internalclientset/typed/apps/internalversion/deploymentconfig.go @@ -30,7 +30,6 @@ type DeploymentConfigInterface interface { Instantiate(deploymentConfigName string, deploymentRequest *apps.DeploymentRequest) (*apps.DeploymentConfig, error) Rollback(deploymentConfigName string, deploymentConfigRollback *apps.DeploymentConfigRollback) (*apps.DeploymentConfig, error) GetScale(deploymentConfigName string, options v1.GetOptions) (*v1beta1.Scale, error) - UpdateScale(deploymentConfigName string, scale *v1beta1.Scale) (*v1beta1.Scale, error) DeploymentConfigExpansion } @@ -202,17 +201,3 @@ func (c *deploymentConfigs) GetScale(deploymentConfigName string, options v1.Get 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 -} diff --git a/pkg/apps/generated/internalclientset/typed/apps/internalversion/deploymentconfig_expansion.go b/pkg/apps/generated/internalclientset/typed/apps/internalversion/deploymentconfig_expansion.go new file mode 100644 index 000000000000..f585548cbd59 --- /dev/null +++ b/pkg/apps/generated/internalclientset/typed/apps/internalversion/deploymentconfig_expansion.go @@ -0,0 +1,33 @@ +package internalversion + +import ( + v1beta1 "k8s.io/api/extensions/v1beta1" + "k8s.io/apimachinery/pkg/runtime" + kapi "k8s.io/kubernetes/pkg/api" +) + +type DeploymentConfigExpansion interface { + UpdateScale(deploymentConfigName string, scale *v1beta1.Scale) (result *v1beta1.Scale, err error) +} + +var scaleCodec = kapi.Codecs.LegacyCodec(v1beta1.SchemeGroupVersion) + +// 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) { + // FIXME: make non-homogenous subresource GV client generation work + data, err := runtime.Encode(scaleCodec, scale) + if err != nil { + return nil, err + } + + result = &v1beta1.Scale{} + err = c.client.Put(). + Namespace(c.ns). + Resource("deploymentconfigs"). + Name(deploymentConfigName). + SubResource("scale"). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/apps/generated/internalclientset/typed/apps/internalversion/fake/fake_deploymentconfig.go b/pkg/apps/generated/internalclientset/typed/apps/internalversion/fake/fake_deploymentconfig.go index a5f17dded4e8..c47f53c9283a 100644 --- a/pkg/apps/generated/internalclientset/typed/apps/internalversion/fake/fake_deploymentconfig.go +++ b/pkg/apps/generated/internalclientset/typed/apps/internalversion/fake/fake_deploymentconfig.go @@ -154,14 +154,3 @@ func (c *FakeDeploymentConfigs) GetScale(deploymentConfigName string, options v1 } 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 -} diff --git a/pkg/apps/generated/internalclientset/typed/apps/internalversion/fake/fake_deploymentconfig_expansion.go b/pkg/apps/generated/internalclientset/typed/apps/internalversion/fake/fake_deploymentconfig_expansion.go new file mode 100644 index 000000000000..927d1bce544e --- /dev/null +++ b/pkg/apps/generated/internalclientset/typed/apps/internalversion/fake/fake_deploymentconfig_expansion.go @@ -0,0 +1,17 @@ +package fake + +import ( + v1beta1 "k8s.io/api/extensions/v1beta1" + testing "k8s.io/client-go/testing" +) + +// UpdateScale takes the representation of a scale and updates it. Returns the server's representation of the scale, and an error, if t +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 +} diff --git a/pkg/apps/generated/internalclientset/typed/apps/internalversion/generated_expansion.go b/pkg/apps/generated/internalclientset/typed/apps/internalversion/generated_expansion.go index a7c19d44db30..94fa5df5bf96 100644 --- a/pkg/apps/generated/internalclientset/typed/apps/internalversion/generated_expansion.go +++ b/pkg/apps/generated/internalclientset/typed/apps/internalversion/generated_expansion.go @@ -1,3 +1 @@ package internalversion - -type DeploymentConfigExpansion interface{}