Automated cherry pick of #33868

pkg/client/clientset_generated/release_1_4/clientset.go

@@ -18,12 +18,17 @@ package release_1_4
 
 import (
 	"github.com/golang/glog"
+	v1alpha1apps "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1"
+	v1beta1authentication "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/authentication/v1beta1"
 	v1beta1authorization "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/authorization/v1beta1"
 	v1autoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/autoscaling/v1"
 	v1batch "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/batch/v1"
+	v1alpha1certificates "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/certificates/v1alpha1"
 	v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/core/v1"
 	v1beta1extensions "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/extensions/v1beta1"
 	v1alpha1policy "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/policy/v1alpha1"
+	v1alpha1rbac "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/rbac/v1alpha1"
+	v1beta1storage "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/storage/v1beta1"
 	restclient "k8s.io/kubernetes/pkg/client/restclient"
 	discovery "k8s.io/kubernetes/pkg/client/typed/discovery"
 	"k8s.io/kubernetes/pkg/util/flowcontrol"
@@ -32,23 +37,33 @@ import (
 type Interface interface {
 	Discovery() discovery.DiscoveryInterface
 	Core() v1core.CoreInterface
+	Apps() v1alpha1apps.AppsInterface
+	Authentication() v1beta1authentication.AuthenticationInterface
 	Authorization() v1beta1authorization.AuthorizationInterface
 	Autoscaling() v1autoscaling.AutoscalingInterface
 	Batch() v1batch.BatchInterface
+	Certificates() v1alpha1certificates.CertificatesInterface
 	Extensions() v1beta1extensions.ExtensionsInterface
 	Policy() v1alpha1policy.PolicyInterface
+	Rbac() v1alpha1rbac.RbacInterface
+	Storage() v1beta1storage.StorageInterface
 }
 
 // Clientset contains the clients for groups. Each group has exactly one
 // version included in a Clientset.
 type Clientset struct {
 	*discovery.DiscoveryClient
 	*v1core.CoreClient
+	*v1alpha1apps.AppsClient
+	*v1beta1authentication.AuthenticationClient
 	*v1beta1authorization.AuthorizationClient
 	*v1autoscaling.AutoscalingClient
 	*v1batch.BatchClient
+	*v1alpha1certificates.CertificatesClient
 	*v1beta1extensions.ExtensionsClient
 	*v1alpha1policy.PolicyClient
+	*v1alpha1rbac.RbacClient
+	*v1beta1storage.StorageClient
 }
 
 // Core retrieves the CoreClient
@@ -59,6 +74,22 @@ func (c *Clientset) Core() v1core.CoreInterface {
 	return c.CoreClient
 }
 
+// Apps retrieves the AppsClient
+func (c *Clientset) Apps() v1alpha1apps.AppsInterface {
+	if c == nil {
+		return nil
+	}
+	return c.AppsClient
+}
+
+// Authentication retrieves the AuthenticationClient
+func (c *Clientset) Authentication() v1beta1authentication.AuthenticationInterface {
+	if c == nil {
+		return nil
+	}
+	return c.AuthenticationClient
+}
+
 // Authorization retrieves the AuthorizationClient
 func (c *Clientset) Authorization() v1beta1authorization.AuthorizationInterface {
 	if c == nil {
@@ -83,6 +114,14 @@ func (c *Clientset) Batch() v1batch.BatchInterface {
 	return c.BatchClient
 }
 
+// Certificates retrieves the CertificatesClient
+func (c *Clientset) Certificates() v1alpha1certificates.CertificatesInterface {
+	if c == nil {
+		return nil
+	}
+	return c.CertificatesClient
+}
+
 // Extensions retrieves the ExtensionsClient
 func (c *Clientset) Extensions() v1beta1extensions.ExtensionsInterface {
 	if c == nil {
@@ -99,6 +138,22 @@ func (c *Clientset) Policy() v1alpha1policy.PolicyInterface {
 	return c.PolicyClient
 }
 
+// Rbac retrieves the RbacClient
+func (c *Clientset) Rbac() v1alpha1rbac.RbacInterface {
+	if c == nil {
+		return nil
+	}
+	return c.RbacClient
+}
+
+// Storage retrieves the StorageClient
+func (c *Clientset) Storage() v1beta1storage.StorageInterface {
+	if c == nil {
+		return nil
+	}
+	return c.StorageClient
+}
+
 // Discovery retrieves the DiscoveryClient
 func (c *Clientset) Discovery() discovery.DiscoveryInterface {
 	return c.DiscoveryClient
@@ -116,6 +171,14 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) {
 	if err != nil {
 		return nil, err
 	}
+	clientset.AppsClient, err = v1alpha1apps.NewForConfig(&configShallowCopy)
+	if err != nil {
+		return nil, err
+	}
+	clientset.AuthenticationClient, err = v1beta1authentication.NewForConfig(&configShallowCopy)
+	if err != nil {
+		return nil, err
+	}
 	clientset.AuthorizationClient, err = v1beta1authorization.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
@@ -128,6 +191,10 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) {
 	if err != nil {
 		return nil, err
 	}
+	clientset.CertificatesClient, err = v1alpha1certificates.NewForConfig(&configShallowCopy)
+	if err != nil {
+		return nil, err
+	}
 	clientset.ExtensionsClient, err = v1beta1extensions.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
@@ -136,6 +203,14 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) {
 	if err != nil {
 		return nil, err
 	}
+	clientset.RbacClient, err = v1alpha1rbac.NewForConfig(&configShallowCopy)
+	if err != nil {
+		return nil, err
+	}
+	clientset.StorageClient, err = v1beta1storage.NewForConfig(&configShallowCopy)
+	if err != nil {
+		return nil, err
+	}
 
 	clientset.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy)
 	if err != nil {
@@ -150,11 +225,16 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) {
 func NewForConfigOrDie(c *restclient.Config) *Clientset {
 	var clientset Clientset
 	clientset.CoreClient = v1core.NewForConfigOrDie(c)
+	clientset.AppsClient = v1alpha1apps.NewForConfigOrDie(c)
+	clientset.AuthenticationClient = v1beta1authentication.NewForConfigOrDie(c)
 	clientset.AuthorizationClient = v1beta1authorization.NewForConfigOrDie(c)
 	clientset.AutoscalingClient = v1autoscaling.NewForConfigOrDie(c)
 	clientset.BatchClient = v1batch.NewForConfigOrDie(c)
+	clientset.CertificatesClient = v1alpha1certificates.NewForConfigOrDie(c)
 	clientset.ExtensionsClient = v1beta1extensions.NewForConfigOrDie(c)
 	clientset.PolicyClient = v1alpha1policy.NewForConfigOrDie(c)
+	clientset.RbacClient = v1alpha1rbac.NewForConfigOrDie(c)
+	clientset.StorageClient = v1beta1storage.NewForConfigOrDie(c)
 
 	clientset.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c)
 	return &clientset
@@ -164,11 +244,16 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset {
 func New(c *restclient.RESTClient) *Clientset {
 	var clientset Clientset
 	clientset.CoreClient = v1core.New(c)
+	clientset.AppsClient = v1alpha1apps.New(c)
+	clientset.AuthenticationClient = v1beta1authentication.New(c)
 	clientset.AuthorizationClient = v1beta1authorization.New(c)
 	clientset.AutoscalingClient = v1autoscaling.New(c)
 	clientset.BatchClient = v1batch.New(c)
+	clientset.CertificatesClient = v1alpha1certificates.New(c)
 	clientset.ExtensionsClient = v1beta1extensions.New(c)
 	clientset.PolicyClient = v1alpha1policy.New(c)
+	clientset.RbacClient = v1alpha1rbac.New(c)
+	clientset.StorageClient = v1beta1storage.New(c)
 
 	clientset.DiscoveryClient = discovery.NewDiscoveryClient(c)
 	return &clientset

pkg/client/clientset_generated/release_1_4/doc.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// This package is generated by client-gen with arguments: --clientset-name=release_1_4 --input=[api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1]
+// This package is generated by client-gen with arguments: --clientset-name=release_1_4 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1]
 
 // This package has the automatically generated clientset.
 package release_1_4

pkg/client/clientset_generated/release_1_4/fake/clientset_generated.go

@@ -20,18 +20,28 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/apimachinery/registered"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4"
+	v1alpha1apps "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1"
+	fakev1alpha1apps "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1/fake"
+	v1beta1authentication "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/authentication/v1beta1"
+	fakev1beta1authentication "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/authentication/v1beta1/fake"
 	v1beta1authorization "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/authorization/v1beta1"
 	fakev1beta1authorization "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/authorization/v1beta1/fake"
 	v1autoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/autoscaling/v1"
 	fakev1autoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/autoscaling/v1/fake"
 	v1batch "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/batch/v1"
 	fakev1batch "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/batch/v1/fake"
+	v1alpha1certificates "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/certificates/v1alpha1"
+	fakev1alpha1certificates "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/certificates/v1alpha1/fake"
 	v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/core/v1"
 	fakev1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/core/v1/fake"
 	v1beta1extensions "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/extensions/v1beta1"
 	fakev1beta1extensions "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/extensions/v1beta1/fake"
 	v1alpha1policy "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/policy/v1alpha1"
 	fakev1alpha1policy "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/policy/v1alpha1/fake"
+	v1alpha1rbac "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/rbac/v1alpha1"
+	fakev1alpha1rbac "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/rbac/v1alpha1/fake"
+	v1beta1storage "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/storage/v1beta1"
+	fakev1beta1storage "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/storage/v1beta1/fake"
 	"k8s.io/kubernetes/pkg/client/testing/core"
 	"k8s.io/kubernetes/pkg/client/typed/discovery"
 	fakediscovery "k8s.io/kubernetes/pkg/client/typed/discovery/fake"
@@ -77,6 +87,16 @@ func (c *Clientset) Core() v1core.CoreInterface {
 	return &fakev1core.FakeCore{Fake: &c.Fake}
 }
 
+// Apps retrieves the AppsClient
+func (c *Clientset) Apps() v1alpha1apps.AppsInterface {
+	return &fakev1alpha1apps.FakeApps{Fake: &c.Fake}
+}
+
+// Authentication retrieves the AuthenticationClient
+func (c *Clientset) Authentication() v1beta1authentication.AuthenticationInterface {
+	return &fakev1beta1authentication.FakeAuthentication{Fake: &c.Fake}
+}
+
 // Authorization retrieves the AuthorizationClient
 func (c *Clientset) Authorization() v1beta1authorization.AuthorizationInterface {
 	return &fakev1beta1authorization.FakeAuthorization{Fake: &c.Fake}
@@ -92,6 +112,11 @@ func (c *Clientset) Batch() v1batch.BatchInterface {
 	return &fakev1batch.FakeBatch{Fake: &c.Fake}
 }
 
+// Certificates retrieves the CertificatesClient
+func (c *Clientset) Certificates() v1alpha1certificates.CertificatesInterface {
+	return &fakev1alpha1certificates.FakeCertificates{Fake: &c.Fake}
+}
+
 // Extensions retrieves the ExtensionsClient
 func (c *Clientset) Extensions() v1beta1extensions.ExtensionsInterface {
 	return &fakev1beta1extensions.FakeExtensions{Fake: &c.Fake}
@@ -101,3 +126,13 @@ func (c *Clientset) Extensions() v1beta1extensions.ExtensionsInterface {
 func (c *Clientset) Policy() v1alpha1policy.PolicyInterface {
 	return &fakev1alpha1policy.FakePolicy{Fake: &c.Fake}
 }
+
+// Rbac retrieves the RbacClient
+func (c *Clientset) Rbac() v1alpha1rbac.RbacInterface {
+	return &fakev1alpha1rbac.FakeRbac{Fake: &c.Fake}
+}
+
+// Storage retrieves the StorageClient
+func (c *Clientset) Storage() v1beta1storage.StorageInterface {
+	return &fakev1beta1storage.FakeStorage{Fake: &c.Fake}
+}

pkg/client/clientset_generated/release_1_4/fake/doc.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// This package is generated by client-gen with arguments: --clientset-name=release_1_4 --input=[api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1]
+// This package is generated by client-gen with arguments: --clientset-name=release_1_4 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1]
 
 // This package has the automatically generated fake clientset.
 package fake

pkg/client/clientset_generated/release_1_4/import_known_versions.go

@@ -22,11 +22,15 @@ import (
 
 	_ "k8s.io/kubernetes/pkg/api/install"
 	"k8s.io/kubernetes/pkg/apimachinery/registered"
+	_ "k8s.io/kubernetes/pkg/apis/apps/install"
+	_ "k8s.io/kubernetes/pkg/apis/authentication/install"
 	_ "k8s.io/kubernetes/pkg/apis/authorization/install"
 	_ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
 	_ "k8s.io/kubernetes/pkg/apis/batch/install"
+	_ "k8s.io/kubernetes/pkg/apis/certificates/install"
 	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
 	_ "k8s.io/kubernetes/pkg/apis/policy/install"
+	_ "k8s.io/kubernetes/pkg/apis/rbac/install"
 	_ "k8s.io/kubernetes/pkg/apis/storage/install"
 )
 

pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1/apps_client.go

@@ -0,0 +1,96 @@
+/*
+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 v1alpha1
+
+import (
+	api "k8s.io/kubernetes/pkg/api"
+	registered "k8s.io/kubernetes/pkg/apimachinery/registered"
+	restclient "k8s.io/kubernetes/pkg/client/restclient"
+	serializer "k8s.io/kubernetes/pkg/runtime/serializer"
+)
+
+type AppsInterface interface {
+	GetRESTClient() *restclient.RESTClient
+	PetSetsGetter
+}
+
+// AppsClient is used to interact with features provided by the Apps group.
+type AppsClient struct {
+	*restclient.RESTClient
+}
+
+func (c *AppsClient) PetSets(namespace string) PetSetInterface {
+	return newPetSets(c, namespace)
+}
+
+// NewForConfig creates a new AppsClient for the given config.
+func NewForConfig(c *restclient.Config) (*AppsClient, error) {
+	config := *c
+	if err := setConfigDefaults(&config); err != nil {
+		return nil, err
+	}
+	client, err := restclient.RESTClientFor(&config)
+	if err != nil {
+		return nil, err
+	}
+	return &AppsClient{client}, nil
+}
+
+// NewForConfigOrDie creates a new AppsClient for the given config and
+// panics if there is an error in the config.
+func NewForConfigOrDie(c *restclient.Config) *AppsClient {
+	client, err := NewForConfig(c)
+	if err != nil {
+		panic(err)
+	}
+	return client
+}
+
+// New creates a new AppsClient for the given RESTClient.
+func New(c *restclient.RESTClient) *AppsClient {
+	return &AppsClient{c}
+}
+
+func setConfigDefaults(config *restclient.Config) error {
+	// if apps group is not registered, return an error
+	g, err := registered.Group("apps")
+	if err != nil {
+		return err
+	}
+	config.APIPath = "/apis"
+	if config.UserAgent == "" {
+		config.UserAgent = restclient.DefaultKubernetesUserAgent()
+	}
+	// TODO: Unconditionally set the config.Version, until we fix the config.
+	//if config.Version == "" {
+	copyGroupVersion := g.GroupVersion
+	config.GroupVersion = &copyGroupVersion
+	//}
+
+	config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs}
+
+	return nil
+}
+
+// GetRESTClient returns a RESTClient that is used to communicate
+// with API server by this client implementation.
+func (c *AppsClient) GetRESTClient() *restclient.RESTClient {
+	if c == nil {
+		return nil
+	}
+	return c.RESTClient
+}