Drop generated clients for Scale types

staging/src/k8s.io/api/apps/v1beta1/types.go

@@ -55,8 +55,6 @@ type ScaleStatus struct {
 	TargetSelector string `json:"targetSelector,omitempty" protobuf:"bytes,3,opt,name=targetSelector"`
 }
 
-// +genclient
-// +genclient:noVerbs
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // Scale represents a scaling request for a resource.

staging/src/k8s.io/api/apps/v1beta2/types.go

@@ -57,8 +57,6 @@ type ScaleStatus struct {
 	TargetSelector string `json:"targetSelector,omitempty" protobuf:"bytes,3,opt,name=targetSelector"`
 }
 
-// +genclient
-// +genclient:noVerbs
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // Scale represents a scaling request for a resource.

staging/src/k8s.io/api/extensions/v1beta1/types.go

@@ -49,8 +49,6 @@ type ScaleStatus struct {
 	TargetSelector string `json:"targetSelector,omitempty" protobuf:"bytes,3,opt,name=targetSelector"`
 }
 
-// +genclient
-// +genclient:noVerbs
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // represents a scaling request for a resource.

staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/BUILD

@@ -13,7 +13,6 @@ go_library(
         "deployment.go",
         "doc.go",
         "generated_expansion.go",
-        "scale.go",
         "statefulset.go",
     ],
     importmap = "k8s.io/kubernetes/vendor/k8s.io/client-go/kubernetes/typed/apps/v1beta1",

staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/apps_client.go

@@ -29,7 +29,6 @@ type AppsV1beta1Interface interface {
 	RESTClient() rest.Interface
 	ControllerRevisionsGetter
 	DeploymentsGetter
-	ScalesGetter
 	StatefulSetsGetter
 }
 
@@ -46,10 +45,6 @@ func (c *AppsV1beta1Client) Deployments(namespace string) DeploymentInterface {
 	return newDeployments(c, namespace)
 }
 
-func (c *AppsV1beta1Client) Scales(namespace string) ScaleInterface {
-	return newScales(c, namespace)
-}
-
 func (c *AppsV1beta1Client) StatefulSets(namespace string) StatefulSetInterface {
 	return newStatefulSets(c, namespace)
 }

staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/BUILD

@@ -12,7 +12,6 @@ go_library(
         "fake_apps_client.go",
         "fake_controllerrevision.go",
         "fake_deployment.go",
-        "fake_scale.go",
         "fake_statefulset.go",
     ],
     importmap = "k8s.io/kubernetes/vendor/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake",

staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/fake_apps_client.go

@@ -36,10 +36,6 @@ func (c *FakeAppsV1beta1) Deployments(namespace string) v1beta1.DeploymentInterf
 	return &FakeDeployments{c, namespace}
 }
 
-func (c *FakeAppsV1beta1) Scales(namespace string) v1beta1.ScaleInterface {
-	return &FakeScales{c, namespace}
-}
-
 func (c *FakeAppsV1beta1) StatefulSets(namespace string) v1beta1.StatefulSetInterface {
 	return &FakeStatefulSets{c, namespace}
 }

staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/fake_scale.go

@@ -1,25 +0,0 @@
-/*
-Copyright The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-package fake
-
-// FakeScales implements ScaleInterface
-type FakeScales struct {
-	Fake *FakeAppsV1beta1
-	ns   string
-}

staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/generated_expansion.go

@@ -22,6 +22,4 @@ type ControllerRevisionExpansion interface{}
 
 type DeploymentExpansion interface{}
 
-type ScaleExpansion interface{}
-
 type StatefulSetExpansion interface{}

staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/scale.go

@@ -1,48 +0,0 @@
-/*
-Copyright The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-package v1beta1
-
-import (
-	rest "k8s.io/client-go/rest"
-)
-
-// ScalesGetter has a method to return a ScaleInterface.
-// A group's client should implement this interface.
-type ScalesGetter interface {
-	Scales(namespace string) ScaleInterface
-}
-
-// ScaleInterface has methods to work with Scale resources.
-type ScaleInterface interface {
-	ScaleExpansion
-}
-
-// scales implements ScaleInterface
-type scales struct {
-	client rest.Interface
-	ns     string
-}
-
-// newScales returns a Scales
-func newScales(c *AppsV1beta1Client, namespace string) *scales {
-	return &scales{
-		client: c.RESTClient(),
-		ns:     namespace,
-	}
-}

staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/BUILD

@@ -15,7 +15,6 @@ go_library(
         "doc.go",
         "generated_expansion.go",
         "replicaset.go",
-        "scale.go",
         "statefulset.go",
     ],
     importmap = "k8s.io/kubernetes/vendor/k8s.io/client-go/kubernetes/typed/apps/v1beta2",

staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/apps_client.go

@@ -31,7 +31,6 @@ type AppsV1beta2Interface interface {
 	DaemonSetsGetter
 	DeploymentsGetter
 	ReplicaSetsGetter
-	ScalesGetter
 	StatefulSetsGetter
 }
 
@@ -56,10 +55,6 @@ func (c *AppsV1beta2Client) ReplicaSets(namespace string) ReplicaSetInterface {
 	return newReplicaSets(c, namespace)
 }
 
-func (c *AppsV1beta2Client) Scales(namespace string) ScaleInterface {
-	return newScales(c, namespace)
-}
-
 func (c *AppsV1beta2Client) StatefulSets(namespace string) StatefulSetInterface {
 	return newStatefulSets(c, namespace)
 }

staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake/BUILD

@@ -14,7 +14,6 @@ go_library(
         "fake_daemonset.go",
         "fake_deployment.go",
         "fake_replicaset.go",
-        "fake_scale.go",
         "fake_statefulset.go",
     ],
     importmap = "k8s.io/kubernetes/vendor/k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake",

staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake/fake_apps_client.go

@@ -44,10 +44,6 @@ func (c *FakeAppsV1beta2) ReplicaSets(namespace string) v1beta2.ReplicaSetInterf
 	return &FakeReplicaSets{c, namespace}
 }
 
-func (c *FakeAppsV1beta2) Scales(namespace string) v1beta2.ScaleInterface {
-	return &FakeScales{c, namespace}
-}
-
 func (c *FakeAppsV1beta2) StatefulSets(namespace string) v1beta2.StatefulSetInterface {
 	return &FakeStatefulSets{c, namespace}
 }

staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake/fake_scale.go

@@ -1,25 +0,0 @@
-/*
-Copyright The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-package fake
-
-// FakeScales implements ScaleInterface
-type FakeScales struct {
-	Fake *FakeAppsV1beta2
-	ns   string
-}

staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/generated_expansion.go

@@ -26,6 +26,4 @@ type DeploymentExpansion interface{}
 
 type ReplicaSetExpansion interface{}
 
-type ScaleExpansion interface{}
-
 type StatefulSetExpansion interface{}

staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/scale.go

@@ -1,48 +0,0 @@
-/*
-Copyright The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-package v1beta2
-
-import (
-	rest "k8s.io/client-go/rest"
-)
-
-// ScalesGetter has a method to return a ScaleInterface.
-// A group's client should implement this interface.
-type ScalesGetter interface {
-	Scales(namespace string) ScaleInterface
-}
-
-// ScaleInterface has methods to work with Scale resources.
-type ScaleInterface interface {
-	ScaleExpansion
-}
-
-// scales implements ScaleInterface
-type scales struct {
-	client rest.Interface
-	ns     string
-}
-
-// newScales returns a Scales
-func newScales(c *AppsV1beta2Client, namespace string) *scales {
-	return &scales{
-		client: c.RESTClient(),
-		ns:     namespace,
-	}
-}

staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/BUILD

@@ -17,16 +17,12 @@ go_library(
         "ingress.go",
         "podsecuritypolicy.go",
         "replicaset.go",
-        "scale.go",
-        "scale_expansion.go",
     ],
     importmap = "k8s.io/kubernetes/vendor/k8s.io/client-go/kubernetes/typed/extensions/v1beta1",
     importpath = "k8s.io/client-go/kubernetes/typed/extensions/v1beta1",
     deps = [
         "//staging/src/k8s.io/api/extensions/v1beta1:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",

staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/extensions_client.go

@@ -32,7 +32,6 @@ type ExtensionsV1beta1Interface interface {
 	IngressesGetter
 	PodSecurityPoliciesGetter
 	ReplicaSetsGetter
-	ScalesGetter
 }
 
 // ExtensionsV1beta1Client is used to interact with features provided by the extensions group.
@@ -60,10 +59,6 @@ func (c *ExtensionsV1beta1Client) ReplicaSets(namespace string) ReplicaSetInterf
 	return newReplicaSets(c, namespace)
 }
 
-func (c *ExtensionsV1beta1Client) Scales(namespace string) ScaleInterface {
-	return newScales(c, namespace)
-}
-
 // NewForConfig creates a new ExtensionsV1beta1Client for the given config.
 func NewForConfig(c *rest.Config) (*ExtensionsV1beta1Client, error) {
 	config := *c

staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/BUILD

@@ -16,8 +16,6 @@ go_library(
         "fake_ingress.go",
         "fake_podsecuritypolicy.go",
         "fake_replicaset.go",
-        "fake_scale.go",
-        "fake_scale_expansion.go",
     ],
     importmap = "k8s.io/kubernetes/vendor/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake",
     importpath = "k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake",

staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_extensions_client.go

@@ -48,10 +48,6 @@ func (c *FakeExtensionsV1beta1) ReplicaSets(namespace string) v1beta1.ReplicaSet
 	return &FakeReplicaSets{c, namespace}
 }
 
-func (c *FakeExtensionsV1beta1) Scales(namespace string) v1beta1.ScaleInterface {
-	return &FakeScales{c, namespace}
-}
-
 // RESTClient returns a RESTClient that is used to communicate
 // with API server by this client implementation.
 func (c *FakeExtensionsV1beta1) RESTClient() rest.Interface {

staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_scale.go

@@ -1,25 +0,0 @@
-/*
-Copyright The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-package fake
-
-// FakeScales implements ScaleInterface
-type FakeScales struct {
-	Fake *FakeExtensionsV1beta1
-	ns   string
-}

staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_scale_expansion.go

@@ -1,47 +0,0 @@
-/*
-Copyright 2015 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package fake
-
-import (
-	"k8s.io/api/extensions/v1beta1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	core "k8s.io/client-go/testing"
-)
-
-func (c *FakeScales) Get(kind string, name string) (result *v1beta1.Scale, err error) {
-	action := core.GetActionImpl{}
-	action.Verb = "get"
-	action.Namespace = c.ns
-	action.Resource = schema.GroupVersionResource{Resource: kind}
-	action.Subresource = "scale"
-	action.Name = name
-	obj, err := c.Fake.Invokes(action, &v1beta1.Scale{})
-	result = obj.(*v1beta1.Scale)
-	return
-}
-
-func (c *FakeScales) Update(kind string, scale *v1beta1.Scale) (result *v1beta1.Scale, err error) {
-	action := core.UpdateActionImpl{}
-	action.Verb = "update"
-	action.Namespace = c.ns
-	action.Resource = schema.GroupVersionResource{Resource: kind}
-	action.Subresource = "scale"
-	action.Object = scale
-	obj, err := c.Fake.Invokes(action, scale)
-	result = obj.(*v1beta1.Scale)
-	return
-}

staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/scale.go

@@ -1,48 +0,0 @@
-/*
-Copyright The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-package v1beta1
-
-import (
-	rest "k8s.io/client-go/rest"
-)
-
-// ScalesGetter has a method to return a ScaleInterface.
-// A group's client should implement this interface.
-type ScalesGetter interface {
-	Scales(namespace string) ScaleInterface
-}
-
-// ScaleInterface has methods to work with Scale resources.
-type ScaleInterface interface {
-	ScaleExpansion
-}
-
-// scales implements ScaleInterface
-type scales struct {
-	client rest.Interface
-	ns     string
-}
-
-// newScales returns a Scales
-func newScales(c *ExtensionsV1beta1Client, namespace string) *scales {
-	return &scales{
-		client: c.RESTClient(),
-		ns:     namespace,
-	}
-}

staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/scale_expansion.go

@@ -1,65 +0,0 @@
-/*
-Copyright 2016 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1beta1
-
-import (
-	"k8s.io/api/extensions/v1beta1"
-	"k8s.io/apimachinery/pkg/api/meta"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-)
-
-// The ScaleExpansion interface allows manually adding extra methods to the ScaleInterface.
-type ScaleExpansion interface {
-	Get(kind string, name string) (*v1beta1.Scale, error)
-	Update(kind string, scale *v1beta1.Scale) (*v1beta1.Scale, error)
-}
-
-// Get takes the reference to scale subresource and returns the subresource or error, if one occurs.
-func (c *scales) Get(kind string, name string) (result *v1beta1.Scale, err error) {
-	result = &v1beta1.Scale{}
-
-	// TODO this method needs to take a proper unambiguous kind
-	fullyQualifiedKind := schema.GroupVersionKind{Kind: kind}
-	resource, _ := meta.UnsafeGuessKindToResource(fullyQualifiedKind)
-
-	err = c.client.Get().
-		Namespace(c.ns).
-		Resource(resource.Resource).
-		Name(name).
-		SubResource("scale").
-		Do().
-		Into(result)
-	return
-}
-
-func (c *scales) Update(kind string, scale *v1beta1.Scale) (result *v1beta1.Scale, err error) {
-	result = &v1beta1.Scale{}
-
-	// TODO this method needs to take a proper unambiguous kind
-	fullyQualifiedKind := schema.GroupVersionKind{Kind: kind}
-	resource, _ := meta.UnsafeGuessKindToResource(fullyQualifiedKind)
-
-	err = c.client.Put().
-		Namespace(scale.Namespace).
-		Resource(resource.Resource).
-		Name(scale.Name).
-		SubResource("scale").
-		Body(scale).
-		Do().
-		Into(result)
-	return
-}

staging/src/k8s.io/client-go/listers/apps/v1beta1/BUILD

@@ -11,7 +11,6 @@ go_library(
         "controllerrevision.go",
         "deployment.go",
         "expansion_generated.go",
-        "scale.go",
         "statefulset.go",
         "statefulset_expansion.go",
     ],

staging/src/k8s.io/client-go/listers/apps/v1beta1/expansion_generated.go

@@ -33,11 +33,3 @@ type DeploymentListerExpansion interface{}
 // DeploymentNamespaceListerExpansion allows custom methods to be added to
 // DeploymentNamespaceLister.
 type DeploymentNamespaceListerExpansion interface{}
-
-// ScaleListerExpansion allows custom methods to be added to
-// ScaleLister.
-type ScaleListerExpansion interface{}
-
-// ScaleNamespaceListerExpansion allows custom methods to be added to
-// ScaleNamespaceLister.
-type ScaleNamespaceListerExpansion interface{}

staging/src/k8s.io/client-go/listers/apps/v1beta1/scale.go

@@ -1,94 +0,0 @@
-/*
-Copyright The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by lister-gen. DO NOT EDIT.
-
-package v1beta1
-
-import (
-	v1beta1 "k8s.io/api/apps/v1beta1"
-	"k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/tools/cache"
-)
-
-// ScaleLister helps list Scales.
-type ScaleLister interface {
-	// List lists all Scales in the indexer.
-	List(selector labels.Selector) (ret []*v1beta1.Scale, err error)
-	// Scales returns an object that can list and get Scales.
-	Scales(namespace string) ScaleNamespaceLister
-	ScaleListerExpansion
-}
-
-// scaleLister implements the ScaleLister interface.
-type scaleLister struct {
-	indexer cache.Indexer
-}
-
-// NewScaleLister returns a new ScaleLister.
-func NewScaleLister(indexer cache.Indexer) ScaleLister {
-	return &scaleLister{indexer: indexer}
-}
-
-// List lists all Scales in the indexer.
-func (s *scaleLister) List(selector labels.Selector) (ret []*v1beta1.Scale, err error) {
-	err = cache.ListAll(s.indexer, selector, func(m interface{}) {
-		ret = append(ret, m.(*v1beta1.Scale))
-	})
-	return ret, err
-}
-
-// Scales returns an object that can list and get Scales.
-func (s *scaleLister) Scales(namespace string) ScaleNamespaceLister {
-	return scaleNamespaceLister{indexer: s.indexer, namespace: namespace}
-}
-
-// ScaleNamespaceLister helps list and get Scales.
-type ScaleNamespaceLister interface {
-	// List lists all Scales in the indexer for a given namespace.
-	List(selector labels.Selector) (ret []*v1beta1.Scale, err error)
-	// Get retrieves the Scale from the indexer for a given namespace and name.
-	Get(name string) (*v1beta1.Scale, error)
-	ScaleNamespaceListerExpansion
-}
-
-// scaleNamespaceLister implements the ScaleNamespaceLister
-// interface.
-type scaleNamespaceLister struct {
-	indexer   cache.Indexer
-	namespace string
-}
-
-// List lists all Scales in the indexer for a given namespace.
-func (s scaleNamespaceLister) List(selector labels.Selector) (ret []*v1beta1.Scale, err error) {
-	err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) {
-		ret = append(ret, m.(*v1beta1.Scale))
-	})
-	return ret, err
-}
-
-// Get retrieves the Scale from the indexer for a given namespace and name.
-func (s scaleNamespaceLister) Get(name string) (*v1beta1.Scale, error) {
-	obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name)
-	if err != nil {
-		return nil, err
-	}
-	if !exists {
-		return nil, errors.NewNotFound(v1beta1.Resource("scale"), name)
-	}
-	return obj.(*v1beta1.Scale), nil
-}

staging/src/k8s.io/client-go/listers/apps/v1beta2/BUILD

@@ -16,7 +16,6 @@ go_library(
         "expansion_generated.go",
         "replicaset.go",
         "replicaset_expansion.go",
-        "scale.go",
         "statefulset.go",
         "statefulset_expansion.go",
     ],

staging/src/k8s.io/client-go/listers/apps/v1beta2/expansion_generated.go

@@ -25,11 +25,3 @@ type ControllerRevisionListerExpansion interface{}
 // ControllerRevisionNamespaceListerExpansion allows custom methods to be added to
 // ControllerRevisionNamespaceLister.
 type ControllerRevisionNamespaceListerExpansion interface{}
-
-// ScaleListerExpansion allows custom methods to be added to
-// ScaleLister.
-type ScaleListerExpansion interface{}
-
-// ScaleNamespaceListerExpansion allows custom methods to be added to
-// ScaleNamespaceLister.
-type ScaleNamespaceListerExpansion interface{}

staging/src/k8s.io/client-go/listers/apps/v1beta2/scale.go

@@ -1,94 +0,0 @@
-/*
-Copyright The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by lister-gen. DO NOT EDIT.
-
-package v1beta2
-
-import (
-	v1beta2 "k8s.io/api/apps/v1beta2"
-	"k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/tools/cache"
-)
-
-// ScaleLister helps list Scales.
-type ScaleLister interface {
-	// List lists all Scales in the indexer.
-	List(selector labels.Selector) (ret []*v1beta2.Scale, err error)
-	// Scales returns an object that can list and get Scales.
-	Scales(namespace string) ScaleNamespaceLister
-	ScaleListerExpansion
-}
-
-// scaleLister implements the ScaleLister interface.
-type scaleLister struct {
-	indexer cache.Indexer
-}
-
-// NewScaleLister returns a new ScaleLister.
-func NewScaleLister(indexer cache.Indexer) ScaleLister {
-	return &scaleLister{indexer: indexer}
-}
-
-// List lists all Scales in the indexer.
-func (s *scaleLister) List(selector labels.Selector) (ret []*v1beta2.Scale, err error) {
-	err = cache.ListAll(s.indexer, selector, func(m interface{}) {
-		ret = append(ret, m.(*v1beta2.Scale))
-	})
-	return ret, err
-}
-
-// Scales returns an object that can list and get Scales.
-func (s *scaleLister) Scales(namespace string) ScaleNamespaceLister {
-	return scaleNamespaceLister{indexer: s.indexer, namespace: namespace}
-}
-
-// ScaleNamespaceLister helps list and get Scales.
-type ScaleNamespaceLister interface {
-	// List lists all Scales in the indexer for a given namespace.
-	List(selector labels.Selector) (ret []*v1beta2.Scale, err error)
-	// Get retrieves the Scale from the indexer for a given namespace and name.
-	Get(name string) (*v1beta2.Scale, error)
-	ScaleNamespaceListerExpansion
-}
-
-// scaleNamespaceLister implements the ScaleNamespaceLister
-// interface.
-type scaleNamespaceLister struct {
-	indexer   cache.Indexer
-	namespace string
-}
-
-// List lists all Scales in the indexer for a given namespace.
-func (s scaleNamespaceLister) List(selector labels.Selector) (ret []*v1beta2.Scale, err error) {
-	err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) {
-		ret = append(ret, m.(*v1beta2.Scale))
-	})
-	return ret, err
-}
-
-// Get retrieves the Scale from the indexer for a given namespace and name.
-func (s scaleNamespaceLister) Get(name string) (*v1beta2.Scale, error) {
-	obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name)
-	if err != nil {
-		return nil, err
-	}
-	if !exists {
-		return nil, errors.NewNotFound(v1beta2.Resource("scale"), name)
-	}
-	return obj.(*v1beta2.Scale), nil
-}

staging/src/k8s.io/client-go/listers/extensions/v1beta1/BUILD

@@ -18,7 +18,6 @@ go_library(
         "podsecuritypolicy.go",
         "replicaset.go",
         "replicaset_expansion.go",
-        "scale.go",
     ],
     importmap = "k8s.io/kubernetes/vendor/k8s.io/client-go/listers/extensions/v1beta1",
     importpath = "k8s.io/client-go/listers/extensions/v1beta1",

staging/src/k8s.io/client-go/listers/extensions/v1beta1/expansion_generated.go

@@ -29,11 +29,3 @@ type IngressNamespaceListerExpansion interface{}
 // PodSecurityPolicyListerExpansion allows custom methods to be added to
 // PodSecurityPolicyLister.
 type PodSecurityPolicyListerExpansion interface{}
-
-// ScaleListerExpansion allows custom methods to be added to
-// ScaleLister.
-type ScaleListerExpansion interface{}
-
-// ScaleNamespaceListerExpansion allows custom methods to be added to
-// ScaleNamespaceLister.
-type ScaleNamespaceListerExpansion interface{}

staging/src/k8s.io/client-go/listers/extensions/v1beta1/scale.go

@@ -1,94 +0,0 @@
-/*
-Copyright The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by lister-gen. DO NOT EDIT.
-
-package v1beta1
-
-import (
-	v1beta1 "k8s.io/api/extensions/v1beta1"
-	"k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/tools/cache"
-)
-
-// ScaleLister helps list Scales.
-type ScaleLister interface {
-	// List lists all Scales in the indexer.
-	List(selector labels.Selector) (ret []*v1beta1.Scale, err error)
-	// Scales returns an object that can list and get Scales.
-	Scales(namespace string) ScaleNamespaceLister
-	ScaleListerExpansion
-}
-
-// scaleLister implements the ScaleLister interface.
-type scaleLister struct {
-	indexer cache.Indexer
-}
-
-// NewScaleLister returns a new ScaleLister.
-func NewScaleLister(indexer cache.Indexer) ScaleLister {
-	return &scaleLister{indexer: indexer}
-}
-
-// List lists all Scales in the indexer.
-func (s *scaleLister) List(selector labels.Selector) (ret []*v1beta1.Scale, err error) {
-	err = cache.ListAll(s.indexer, selector, func(m interface{}) {
-		ret = append(ret, m.(*v1beta1.Scale))
-	})
-	return ret, err
-}
-
-// Scales returns an object that can list and get Scales.
-func (s *scaleLister) Scales(namespace string) ScaleNamespaceLister {
-	return scaleNamespaceLister{indexer: s.indexer, namespace: namespace}
-}
-
-// ScaleNamespaceLister helps list and get Scales.
-type ScaleNamespaceLister interface {
-	// List lists all Scales in the indexer for a given namespace.
-	List(selector labels.Selector) (ret []*v1beta1.Scale, err error)
-	// Get retrieves the Scale from the indexer for a given namespace and name.
-	Get(name string) (*v1beta1.Scale, error)
-	ScaleNamespaceListerExpansion
-}
-
-// scaleNamespaceLister implements the ScaleNamespaceLister
-// interface.
-type scaleNamespaceLister struct {
-	indexer   cache.Indexer
-	namespace string
-}
-
-// List lists all Scales in the indexer for a given namespace.
-func (s scaleNamespaceLister) List(selector labels.Selector) (ret []*v1beta1.Scale, err error) {
-	err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) {
-		ret = append(ret, m.(*v1beta1.Scale))
-	})
-	return ret, err
-}
-
-// Get retrieves the Scale from the indexer for a given namespace and name.
-func (s scaleNamespaceLister) Get(name string) (*v1beta1.Scale, error) {
-	obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name)
-	if err != nil {
-		return nil, err
-	}
-	if !exists {
-		return nil, errors.NewNotFound(v1beta1.Resource("scale"), name)
-	}
-	return obj.(*v1beta1.Scale), nil
-}

test/integration/deployment/deployment_test.go

@@ -1269,9 +1269,7 @@ func testScalingUsingScaleSubresource(t *testing.T, tester *deploymentTester, re
 	if err != nil {
 		t.Fatalf("Failed to obtain deployment %q: %v", deploymentName, err)
 	}
-	kind := "Deployment"
+	scale, err := tester.c.AppsV1().Deployments(ns).GetScale(deploymentName, metav1.GetOptions{})
-	scaleClient := tester.c.ExtensionsV1beta1().Scales(ns)
-	scale, err := scaleClient.Get(kind, deploymentName)
 	if err != nil {
 		t.Fatalf("Failed to obtain scale subresource for deployment %q: %v", deploymentName, err)
 	}
@@ -1280,12 +1278,12 @@ func testScalingUsingScaleSubresource(t *testing.T, tester *deploymentTester, re
 	}
 
 	if err := retry.RetryOnConflict(retry.DefaultBackoff, func() error {
-		scale, err := scaleClient.Get(kind, deploymentName)
+		scale, err := tester.c.AppsV1().Deployments(ns).GetScale(deploymentName, metav1.GetOptions{})
 		if err != nil {
 			return err
 		}
 		scale.Spec.Replicas = replicas
-		_, err = scaleClient.Update(kind, scale)
+		_, err = tester.c.AppsV1().Deployments(ns).UpdateScale(deploymentName, scale)
 		return err
 	}); err != nil {
 		t.Fatalf("Failed to set .Spec.Replicas of scale subresource for deployment %q: %v", deploymentName, err)

test/integration/replicaset/replicaset_test.go

@@ -340,9 +340,7 @@ func testScalingUsingScaleSubresource(t *testing.T, c clientset.Interface, rs *a
 	if err != nil {
 		t.Fatalf("Failed to obtain rs %s: %v", rs.Name, err)
 	}
-	kind := "ReplicaSet"
+	scale, err := c.AppsV1().ReplicaSets(ns).GetScale(rs.Name, metav1.GetOptions{})
-	scaleClient := c.ExtensionsV1beta1().Scales(ns)
-	scale, err := scaleClient.Get(kind, rs.Name)
 	if err != nil {
 		t.Fatalf("Failed to obtain scale subresource for rs %s: %v", rs.Name, err)
 	}
@@ -351,12 +349,12 @@ func testScalingUsingScaleSubresource(t *testing.T, c clientset.Interface, rs *a
 	}
 
 	if err := retry.RetryOnConflict(retry.DefaultBackoff, func() error {
-		scale, err := scaleClient.Get(kind, rs.Name)
+		scale, err := c.AppsV1().ReplicaSets(ns).GetScale(rs.Name, metav1.GetOptions{})
 		if err != nil {
 			return err
 		}
 		scale.Spec.Replicas = replicas
-		_, err = scaleClient.Update(kind, scale)
+		_, err = c.AppsV1().ReplicaSets(ns).UpdateScale(rs.Name, scale)
 		return err
 	}); err != nil {
 		t.Fatalf("Failed to set .Spec.Replicas of scale subresource for rs %s: %v", rs.Name, err)

test/integration/replicationcontroller/replicationcontroller_test.go

@@ -340,9 +340,7 @@ func testScalingUsingScaleSubresource(t *testing.T, c clientset.Interface, rc *v
 	if err != nil {
 		t.Fatalf("Failed to obtain rc %s: %v", rc.Name, err)
 	}
-	kind := "ReplicationController"
+	scale, err := c.CoreV1().ReplicationControllers(ns).GetScale(rc.Name, metav1.GetOptions{})
-	scaleClient := c.ExtensionsV1beta1().Scales(ns)
-	scale, err := scaleClient.Get(kind, rc.Name)
 	if err != nil {
 		t.Fatalf("Failed to obtain scale subresource for rc %s: %v", rc.Name, err)
 	}
@@ -351,12 +349,12 @@ func testScalingUsingScaleSubresource(t *testing.T, c clientset.Interface, rc *v
 	}
 
 	if err := retry.RetryOnConflict(retry.DefaultBackoff, func() error {
-		scale, err := scaleClient.Get(kind, rc.Name)
+		scale, err := c.CoreV1().ReplicationControllers(ns).GetScale(rc.Name, metav1.GetOptions{})
 		if err != nil {
 			return err
 		}
 		scale.Spec.Replicas = replicas
-		_, err = scaleClient.Update(kind, scale)
+		_, err = c.CoreV1().ReplicationControllers(ns).UpdateScale(rc.Name, scale)
 		return err
 	}); err != nil {
 		t.Fatalf("Failed to set .Spec.Replicas of scale subresource for rc %s: %v", rc.Name, err)