Update to kube v1.17

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>

vendor/k8s.io/client-go/scale/client.go

@@ -23,6 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/dynamic"
 	restclient "k8s.io/client-go/rest"
 )
@@ -75,6 +76,19 @@ func New(baseClient restclient.Interface, mapper PreferredResourceMapper, resolv
 	}
 }
 
+// apiPathFor returns the absolute api path for the given GroupVersion
+func (c *scaleClient) apiPathFor(groupVer schema.GroupVersion) string {
+	// we need to set the API path based on GroupVersion (defaulting to the legacy path if none is set)
+	// TODO: we "cheat" here since the API path really only depends on group ATM, but this should
+	// *probably* take GroupVersionResource and not GroupVersionKind.
+	apiPath := c.apiPathResolverFunc(groupVer.WithKind(""))
+	if apiPath == "" {
+		apiPath = "/api"
+	}
+
+	return restclient.DefaultVersionedAPIPath(apiPath, groupVer)
+}
+
 // pathAndVersionFor returns the appropriate base path and the associated full GroupVersionResource
 // for the given GroupResource
 func (c *scaleClient) pathAndVersionFor(resource schema.GroupResource) (string, schema.GroupVersionResource, error) {
@@ -85,17 +99,7 @@ func (c *scaleClient) pathAndVersionFor(resource schema.GroupResource) (string,
 
 	groupVer := gvr.GroupVersion()
 
-	// we need to set the API path based on GroupVersion (defaulting to the legacy path if none is set)
-	// TODO: we "cheat" here since the API path really only depends on group ATM, but this should
-	// *probably* take GroupVersionResource and not GroupVersionKind.
-	apiPath := c.apiPathResolverFunc(groupVer.WithKind(""))
-	if apiPath == "" {
-		apiPath = "/api"
-	}
-
-	path := restclient.DefaultVersionedAPIPath(apiPath, groupVer)
-
-	return path, gvr, nil
+	return c.apiPathFor(groupVer), gvr, nil
 }
 
 // namespacedScaleClient is an ScaleInterface for fetching
@@ -105,6 +109,27 @@ type namespacedScaleClient struct {
 	namespace string
 }
 
+// convertToScale converts the response body to autoscaling/v1.Scale
+func convertToScale(result *restclient.Result) (*autoscaling.Scale, error) {
+	scaleBytes, err := result.Raw()
+	if err != nil {
+		return nil, err
+	}
+	decoder := scaleConverter.codecs.UniversalDecoder(scaleConverter.ScaleVersions()...)
+	rawScaleObj, err := runtime.Decode(decoder, scaleBytes)
+	if err != nil {
+		return nil, err
+	}
+
+	// convert whatever this is to autoscaling/v1.Scale
+	scaleObj, err := scaleConverter.ConvertToVersion(rawScaleObj, autoscaling.SchemeGroupVersion)
+	if err != nil {
+		return nil, fmt.Errorf("received an object from a /scale endpoint which was not convertible to autoscaling Scale: %v", err)
+	}
+
+	return scaleObj.(*autoscaling.Scale), nil
+}
+
 func (c *scaleClient) Scales(namespace string) ScaleInterface {
 	return &namespacedScaleClient{
 		client:    c,
@@ -125,7 +150,7 @@ func (c *namespacedScaleClient) Get(resource schema.GroupResource, name string)
 
 	result := c.client.clientBase.Get().
 		AbsPath(path).
-		Namespace(c.namespace).
+		NamespaceIfScoped(c.namespace, c.namespace != "").
 		Resource(gvr.Resource).
 		Name(name).
 		SubResource("scale").
@@ -134,23 +159,7 @@ func (c *namespacedScaleClient) Get(resource schema.GroupResource, name string)
 		return nil, err
 	}
 
-	scaleBytes, err := result.Raw()
-	if err != nil {
-		return nil, err
-	}
-	decoder := scaleConverter.codecs.UniversalDecoder(scaleConverter.ScaleVersions()...)
-	rawScaleObj, err := runtime.Decode(decoder, scaleBytes)
-	if err != nil {
-		return nil, err
-	}
-
-	// convert whatever this is to autoscaling/v1.Scale
-	scaleObj, err := scaleConverter.ConvertToVersion(rawScaleObj, autoscaling.SchemeGroupVersion)
-	if err != nil {
-		return nil, fmt.Errorf("received an object from a /scale endpoint which was not convertible to autoscaling Scale: %v", err)
-	}
-
-	return scaleObj.(*autoscaling.Scale), nil
+	return convertToScale(&result)
 }
 
 func (c *namespacedScaleClient) Update(resource schema.GroupResource, scale *autoscaling.Scale) (*autoscaling.Scale, error) {
@@ -182,7 +191,7 @@ func (c *namespacedScaleClient) Update(resource schema.GroupResource, scale *aut
 
 	result := c.client.clientBase.Put().
 		AbsPath(path).
-		Namespace(c.namespace).
+		NamespaceIfScoped(c.namespace, c.namespace != "").
 		Resource(gvr.Resource).
 		Name(scale.Name).
 		SubResource("scale").
@@ -195,21 +204,22 @@ func (c *namespacedScaleClient) Update(resource schema.GroupResource, scale *aut
 		return nil, err
 	}
 
-	scaleBytes, err := result.Raw()
-	if err != nil {
-		return nil, err
-	}
-	decoder := scaleConverter.codecs.UniversalDecoder(scaleConverter.ScaleVersions()...)
-	rawScaleObj, err := runtime.Decode(decoder, scaleBytes)
-	if err != nil {
-		return nil, err
-	}
-
-	// convert whatever this is back to autoscaling/v1.Scale
-	scaleObj, err := scaleConverter.ConvertToVersion(rawScaleObj, autoscaling.SchemeGroupVersion)
-	if err != nil {
-		return nil, fmt.Errorf("received an object from a /scale endpoint which was not convertible to autoscaling Scale: %v", err)
-	}
-
-	return scaleObj.(*autoscaling.Scale), err
+	return convertToScale(&result)
+}
+
+func (c *namespacedScaleClient) Patch(gvr schema.GroupVersionResource, name string, pt types.PatchType, data []byte) (*autoscaling.Scale, error) {
+	groupVersion := gvr.GroupVersion()
+	result := c.client.clientBase.Patch(pt).
+		AbsPath(c.client.apiPathFor(groupVersion)).
+		NamespaceIfScoped(c.namespace, c.namespace != "").
+		Resource(gvr.Resource).
+		Name(name).
+		SubResource("scale").
+		Body(data).
+		Do()
+	if err := result.Error(); err != nil {
+		return nil, err
+	}
+
+	return convertToScale(&result)
 }

vendor/k8s.io/client-go/scale/doc.go

@@ -18,4 +18,4 @@ limitations under the License.
 // and updating Scale for any resource which implements the `scale` subresource,
 // as long as that subresource operates on a version of scale convertable to
 // autoscaling.Scale.
-package scale
+package scale // import "k8s.io/client-go/scale"

vendor/k8s.io/client-go/scale/interfaces.go

@@ -19,11 +19,13 @@ package scale
 import (
 	autoscalingapi "k8s.io/api/autoscaling/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
 )
 
 // ScalesGetter can produce a ScaleInterface
-// for a particular namespace.
 type ScalesGetter interface {
+	// Scales produces a ScaleInterface for a particular namespace.
+	// Set namespace to the empty string for non-namespaced resources.
 	Scales(namespace string) ScaleInterface
 }
 
@@ -36,4 +38,7 @@ type ScaleInterface interface {
 
 	// Update updates the scale of the given scalable resource.
 	Update(resource schema.GroupResource, scale *autoscalingapi.Scale) (*autoscalingapi.Scale, error)
+
+	// Patch patches the scale of the given scalable resource.
+	Patch(gvr schema.GroupVersionResource, name string, pt types.PatchType, data []byte) (*autoscalingapi.Scale, error)
 }

vendor/k8s.io/client-go/scale/scheme/appsv1beta1/conversion.go

@@ -22,23 +22,9 @@ import (
 	v1beta1 "k8s.io/api/apps/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/runtime"
 	scheme "k8s.io/client-go/scale/scheme"
 )
 
-// addConversions registers conversions between the internal version
-// of Scale and supported external versions of Scale.
-func addConversionFuncs(scheme *runtime.Scheme) error {
-	err := scheme.AddConversionFuncs(
-		Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus,
-		Convert_v1beta1_ScaleStatus_To_scheme_ScaleStatus,
-	)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
 func Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus(in *scheme.ScaleStatus, out *v1beta1.ScaleStatus, s conversion.Scope) error {
 	out.Replicas = in.Replicas
 	out.Selector = nil

vendor/k8s.io/client-go/scale/scheme/appsv1beta1/register.go

@@ -41,5 +41,5 @@ func init() {
 	// We only register manually written functions here. The registration of the
 	// generated functions takes place in the generated files. The separation
 	// makes the code compile even when the generated files are missing.
-	localSchemeBuilder.Register(addConversionFuncs)
+	localSchemeBuilder.Register()
 }

vendor/k8s.io/client-go/scale/scheme/appsv1beta1/zz_generated.conversion.go

@@ -54,16 +54,6 @@ func RegisterConversions(s *runtime.Scheme) error {
 	}); err != nil {
 		return err
 	}
-	if err := s.AddGeneratedConversionFunc((*v1beta1.ScaleStatus)(nil), (*scheme.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1beta1_ScaleStatus_To_scheme_ScaleStatus(a.(*v1beta1.ScaleStatus), b.(*scheme.ScaleStatus), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*scheme.ScaleStatus)(nil), (*v1beta1.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus(a.(*scheme.ScaleStatus), b.(*v1beta1.ScaleStatus), scope)
-	}); err != nil {
-		return err
-	}
 	if err := s.AddConversionFunc((*scheme.ScaleStatus)(nil), (*v1beta1.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
 		return Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus(a.(*scheme.ScaleStatus), b.(*v1beta1.ScaleStatus), scope)
 	}); err != nil {

vendor/k8s.io/client-go/scale/scheme/appsv1beta2/conversion.go

@@ -22,23 +22,9 @@ import (
 	v1beta2 "k8s.io/api/apps/v1beta2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/runtime"
 	scheme "k8s.io/client-go/scale/scheme"
 )
 
-// addConversions registers conversions between the internal version
-// of Scale and supported external versions of Scale.
-func addConversionFuncs(scheme *runtime.Scheme) error {
-	err := scheme.AddConversionFuncs(
-		Convert_scheme_ScaleStatus_To_v1beta2_ScaleStatus,
-		Convert_v1beta2_ScaleStatus_To_scheme_ScaleStatus,
-	)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
 func Convert_scheme_ScaleStatus_To_v1beta2_ScaleStatus(in *scheme.ScaleStatus, out *v1beta2.ScaleStatus, s conversion.Scope) error {
 	out.Replicas = in.Replicas
 	out.Selector = nil

vendor/k8s.io/client-go/scale/scheme/appsv1beta2/register.go

@@ -41,5 +41,5 @@ func init() {
 	// We only register manually written functions here. The registration of the
 	// generated functions takes place in the generated files. The separation
 	// makes the code compile even when the generated files are missing.
-	localSchemeBuilder.Register(addConversionFuncs)
+	localSchemeBuilder.Register()
 }

vendor/k8s.io/client-go/scale/scheme/appsv1beta2/zz_generated.conversion.go

@@ -54,16 +54,6 @@ func RegisterConversions(s *runtime.Scheme) error {
 	}); err != nil {
 		return err
 	}
-	if err := s.AddGeneratedConversionFunc((*v1beta2.ScaleStatus)(nil), (*scheme.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1beta2_ScaleStatus_To_scheme_ScaleStatus(a.(*v1beta2.ScaleStatus), b.(*scheme.ScaleStatus), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*scheme.ScaleStatus)(nil), (*v1beta2.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_scheme_ScaleStatus_To_v1beta2_ScaleStatus(a.(*scheme.ScaleStatus), b.(*v1beta2.ScaleStatus), scope)
-	}); err != nil {
-		return err
-	}
 	if err := s.AddConversionFunc((*scheme.ScaleStatus)(nil), (*v1beta2.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
 		return Convert_scheme_ScaleStatus_To_v1beta2_ScaleStatus(a.(*scheme.ScaleStatus), b.(*v1beta2.ScaleStatus), scope)
 	}); err != nil {

vendor/k8s.io/client-go/scale/scheme/autoscalingv1/conversion.go

@@ -22,24 +22,9 @@ import (
 	v1 "k8s.io/api/autoscaling/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/runtime"
 	scheme "k8s.io/client-go/scale/scheme"
 )
 
-// addConversions registers conversions between the internal version
-// of Scale and supported external versions of Scale.
-func addConversionFuncs(scheme *runtime.Scheme) error {
-	err := scheme.AddConversionFuncs(
-		Convert_scheme_ScaleStatus_To_v1_ScaleStatus,
-		Convert_v1_ScaleStatus_To_scheme_ScaleStatus,
-	)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func Convert_scheme_ScaleStatus_To_v1_ScaleStatus(in *scheme.ScaleStatus, out *v1.ScaleStatus, s conversion.Scope) error {
 	out.Replicas = in.Replicas
 	out.Selector = ""

vendor/k8s.io/client-go/scale/scheme/autoscalingv1/register.go

@@ -41,5 +41,5 @@ func init() {
 	// We only register manually written functions here. The registration of the
 	// generated functions takes place in the generated files. The separation
 	// makes the code compile even when the generated files are missing.
-	localSchemeBuilder.Register(addConversionFuncs)
+	localSchemeBuilder.Register()
 }

vendor/k8s.io/client-go/scale/scheme/autoscalingv1/zz_generated.conversion.go

@@ -54,16 +54,6 @@ func RegisterConversions(s *runtime.Scheme) error {
 	}); err != nil {
 		return err
 	}
-	if err := s.AddGeneratedConversionFunc((*v1.ScaleStatus)(nil), (*scheme.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1_ScaleStatus_To_scheme_ScaleStatus(a.(*v1.ScaleStatus), b.(*scheme.ScaleStatus), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*scheme.ScaleStatus)(nil), (*v1.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_scheme_ScaleStatus_To_v1_ScaleStatus(a.(*scheme.ScaleStatus), b.(*v1.ScaleStatus), scope)
-	}); err != nil {
-		return err
-	}
 	if err := s.AddConversionFunc((*scheme.ScaleStatus)(nil), (*v1.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
 		return Convert_scheme_ScaleStatus_To_v1_ScaleStatus(a.(*scheme.ScaleStatus), b.(*v1.ScaleStatus), scope)
 	}); err != nil {

vendor/k8s.io/client-go/scale/scheme/extensionsv1beta1/conversion.go

@@ -22,23 +22,9 @@ import (
 	v1beta1 "k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/runtime"
 	scheme "k8s.io/client-go/scale/scheme"
 )
 
-// addConversions registers conversions between the internal version
-// of Scale and supported external versions of Scale.
-func addConversionFuncs(scheme *runtime.Scheme) error {
-	err := scheme.AddConversionFuncs(
-		Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus,
-		Convert_v1beta1_ScaleStatus_To_scheme_ScaleStatus,
-	)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
 func Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus(in *scheme.ScaleStatus, out *v1beta1.ScaleStatus, s conversion.Scope) error {
 	out.Replicas = in.Replicas
 	out.Selector = nil

vendor/k8s.io/client-go/scale/scheme/extensionsv1beta1/register.go

@@ -41,5 +41,5 @@ func init() {
 	// We only register manually written functions here. The registration of the
 	// generated functions takes place in the generated files. The separation
 	// makes the code compile even when the generated files are missing.
-	localSchemeBuilder.Register(addConversionFuncs)
+	localSchemeBuilder.Register()
 }

vendor/k8s.io/client-go/scale/scheme/extensionsv1beta1/zz_generated.conversion.go

@@ -54,16 +54,6 @@ func RegisterConversions(s *runtime.Scheme) error {
 	}); err != nil {
 		return err
 	}
-	if err := s.AddGeneratedConversionFunc((*v1beta1.ScaleStatus)(nil), (*scheme.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1beta1_ScaleStatus_To_scheme_ScaleStatus(a.(*v1beta1.ScaleStatus), b.(*scheme.ScaleStatus), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*scheme.ScaleStatus)(nil), (*v1beta1.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus(a.(*scheme.ScaleStatus), b.(*v1beta1.ScaleStatus), scope)
-	}); err != nil {
-		return err
-	}
 	if err := s.AddConversionFunc((*scheme.ScaleStatus)(nil), (*v1beta1.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
 		return Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus(a.(*scheme.ScaleStatus), b.(*v1beta1.ScaleStatus), scope)
 	}); err != nil {

vendor/k8s.io/client-go/scale/scheme/types.go

@@ -28,15 +28,15 @@ import (
 // Scale represents a scaling request for a resource.
 type Scale struct {
 	metav1.TypeMeta
-	// Standard object metadata; More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata.
+	// Standard object metadata; More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata.
 	// +optional
 	metav1.ObjectMeta
 
-	// defines the behavior of the scale. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status.
+	// defines the behavior of the scale. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status.
 	// +optional
 	Spec ScaleSpec
 
-	// current status of the scale. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status. Read-only.
+	// current status of the scale. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status. Read-only.
 	// +optional
 	Status ScaleStatus
 }