Merge pull request #49370 from sttts/sttts-no-clientset-embedding

Automatic merge from submit-queue (batch tested with PRs 49370, 49481)

client-gen: stop embedding of GroupVersion client intfs

It is undefined (or at least uncontrollable) which methods of the clientset apigroup
interfaces are actually inherited. Moreover, there might be nameconflicts between the
accessors and inherited methods. This PR removes the embedding to make it unambiguous.

```release-note
Enforce explicit references to API group client interfaces in clientsets to avoid ambiguity.
```

Kubernetes-commit: 979c86f3ddff4402937eef595b8bb02672e67687

kubernetes/clientset.go

@@ -105,228 +105,228 @@ type Interface interface {
 // version included in a Clientset.
 type Clientset struct {
 	*discovery.DiscoveryClient
-	*admissionregistrationv1alpha1.AdmissionregistrationV1alpha1Client
+	admissionregistrationV1alpha1 *admissionregistrationv1alpha1.AdmissionregistrationV1alpha1Client
-	*appsv1beta1.AppsV1beta1Client
+	appsV1beta1                   *appsv1beta1.AppsV1beta1Client
-	*appsv1beta2.AppsV1beta2Client
+	appsV1beta2                   *appsv1beta2.AppsV1beta2Client
-	*authenticationv1.AuthenticationV1Client
+	authenticationV1              *authenticationv1.AuthenticationV1Client
-	*authenticationv1beta1.AuthenticationV1beta1Client
+	authenticationV1beta1         *authenticationv1beta1.AuthenticationV1beta1Client
-	*authorizationv1.AuthorizationV1Client
+	authorizationV1               *authorizationv1.AuthorizationV1Client
-	*authorizationv1beta1.AuthorizationV1beta1Client
+	authorizationV1beta1          *authorizationv1beta1.AuthorizationV1beta1Client
-	*autoscalingv1.AutoscalingV1Client
+	autoscalingV1                 *autoscalingv1.AutoscalingV1Client
-	*autoscalingv2alpha1.AutoscalingV2alpha1Client
+	autoscalingV2alpha1           *autoscalingv2alpha1.AutoscalingV2alpha1Client
-	*batchv1.BatchV1Client
+	batchV1                       *batchv1.BatchV1Client
-	*batchv2alpha1.BatchV2alpha1Client
+	batchV2alpha1                 *batchv2alpha1.BatchV2alpha1Client
-	*certificatesv1beta1.CertificatesV1beta1Client
+	certificatesV1beta1           *certificatesv1beta1.CertificatesV1beta1Client
-	*corev1.CoreV1Client
+	coreV1                        *corev1.CoreV1Client
-	*extensionsv1beta1.ExtensionsV1beta1Client
+	extensionsV1beta1             *extensionsv1beta1.ExtensionsV1beta1Client
-	*networkingv1.NetworkingV1Client
+	networkingV1                  *networkingv1.NetworkingV1Client
-	*policyv1beta1.PolicyV1beta1Client
+	policyV1beta1                 *policyv1beta1.PolicyV1beta1Client
-	*rbacv1beta1.RbacV1beta1Client
+	rbacV1beta1                   *rbacv1beta1.RbacV1beta1Client
-	*rbacv1alpha1.RbacV1alpha1Client
+	rbacV1alpha1                  *rbacv1alpha1.RbacV1alpha1Client
-	*schedulingv1alpha1.SchedulingV1alpha1Client
+	schedulingV1alpha1            *schedulingv1alpha1.SchedulingV1alpha1Client
-	*settingsv1alpha1.SettingsV1alpha1Client
+	settingsV1alpha1              *settingsv1alpha1.SettingsV1alpha1Client
-	*storagev1beta1.StorageV1beta1Client
+	storageV1beta1                *storagev1beta1.StorageV1beta1Client
-	*storagev1.StorageV1Client
+	storageV1                     *storagev1.StorageV1Client
 }
 
 // AdmissionregistrationV1alpha1 retrieves the AdmissionregistrationV1alpha1Client
 func (c *Clientset) AdmissionregistrationV1alpha1() admissionregistrationv1alpha1.AdmissionregistrationV1alpha1Interface {
-	return c.AdmissionregistrationV1alpha1Client
+	return c.admissionregistrationV1alpha1
 }
 
 // Deprecated: Admissionregistration retrieves the default version of AdmissionregistrationClient.
 // Please explicitly pick a version.
 func (c *Clientset) Admissionregistration() admissionregistrationv1alpha1.AdmissionregistrationV1alpha1Interface {
-	return c.AdmissionregistrationV1alpha1Client
+	return c.admissionregistrationV1alpha1
 }
 
 // AppsV1beta1 retrieves the AppsV1beta1Client
 func (c *Clientset) AppsV1beta1() appsv1beta1.AppsV1beta1Interface {
-	return c.AppsV1beta1Client
+	return c.appsV1beta1
 }
 
 // AppsV1beta2 retrieves the AppsV1beta2Client
 func (c *Clientset) AppsV1beta2() appsv1beta2.AppsV1beta2Interface {
-	return c.AppsV1beta2Client
+	return c.appsV1beta2
 }
 
 // Deprecated: Apps retrieves the default version of AppsClient.
 // Please explicitly pick a version.
 func (c *Clientset) Apps() appsv1beta2.AppsV1beta2Interface {
-	return c.AppsV1beta2Client
+	return c.appsV1beta2
 }
 
 // AuthenticationV1 retrieves the AuthenticationV1Client
 func (c *Clientset) AuthenticationV1() authenticationv1.AuthenticationV1Interface {
-	return c.AuthenticationV1Client
+	return c.authenticationV1
 }
 
 // Deprecated: Authentication retrieves the default version of AuthenticationClient.
 // Please explicitly pick a version.
 func (c *Clientset) Authentication() authenticationv1.AuthenticationV1Interface {
-	return c.AuthenticationV1Client
+	return c.authenticationV1
 }
 
 // AuthenticationV1beta1 retrieves the AuthenticationV1beta1Client
 func (c *Clientset) AuthenticationV1beta1() authenticationv1beta1.AuthenticationV1beta1Interface {
-	return c.AuthenticationV1beta1Client
+	return c.authenticationV1beta1
 }
 
 // AuthorizationV1 retrieves the AuthorizationV1Client
 func (c *Clientset) AuthorizationV1() authorizationv1.AuthorizationV1Interface {
-	return c.AuthorizationV1Client
+	return c.authorizationV1
 }
 
 // Deprecated: Authorization retrieves the default version of AuthorizationClient.
 // Please explicitly pick a version.
 func (c *Clientset) Authorization() authorizationv1.AuthorizationV1Interface {
-	return c.AuthorizationV1Client
+	return c.authorizationV1
 }
 
 // AuthorizationV1beta1 retrieves the AuthorizationV1beta1Client
 func (c *Clientset) AuthorizationV1beta1() authorizationv1beta1.AuthorizationV1beta1Interface {
-	return c.AuthorizationV1beta1Client
+	return c.authorizationV1beta1
 }
 
 // AutoscalingV1 retrieves the AutoscalingV1Client
 func (c *Clientset) AutoscalingV1() autoscalingv1.AutoscalingV1Interface {
-	return c.AutoscalingV1Client
+	return c.autoscalingV1
 }
 
 // Deprecated: Autoscaling retrieves the default version of AutoscalingClient.
 // Please explicitly pick a version.
 func (c *Clientset) Autoscaling() autoscalingv1.AutoscalingV1Interface {
-	return c.AutoscalingV1Client
+	return c.autoscalingV1
 }
 
 // AutoscalingV2alpha1 retrieves the AutoscalingV2alpha1Client
 func (c *Clientset) AutoscalingV2alpha1() autoscalingv2alpha1.AutoscalingV2alpha1Interface {
-	return c.AutoscalingV2alpha1Client
+	return c.autoscalingV2alpha1
 }
 
 // BatchV1 retrieves the BatchV1Client
 func (c *Clientset) BatchV1() batchv1.BatchV1Interface {
-	return c.BatchV1Client
+	return c.batchV1
 }
 
 // Deprecated: Batch retrieves the default version of BatchClient.
 // Please explicitly pick a version.
 func (c *Clientset) Batch() batchv1.BatchV1Interface {
-	return c.BatchV1Client
+	return c.batchV1
 }
 
 // BatchV2alpha1 retrieves the BatchV2alpha1Client
 func (c *Clientset) BatchV2alpha1() batchv2alpha1.BatchV2alpha1Interface {
-	return c.BatchV2alpha1Client
+	return c.batchV2alpha1
 }
 
 // CertificatesV1beta1 retrieves the CertificatesV1beta1Client
 func (c *Clientset) CertificatesV1beta1() certificatesv1beta1.CertificatesV1beta1Interface {
-	return c.CertificatesV1beta1Client
+	return c.certificatesV1beta1
 }
 
 // Deprecated: Certificates retrieves the default version of CertificatesClient.
 // Please explicitly pick a version.
 func (c *Clientset) Certificates() certificatesv1beta1.CertificatesV1beta1Interface {
-	return c.CertificatesV1beta1Client
+	return c.certificatesV1beta1
 }
 
 // CoreV1 retrieves the CoreV1Client
 func (c *Clientset) CoreV1() corev1.CoreV1Interface {
-	return c.CoreV1Client
+	return c.coreV1
 }
 
 // Deprecated: Core retrieves the default version of CoreClient.
 // Please explicitly pick a version.
 func (c *Clientset) Core() corev1.CoreV1Interface {
-	return c.CoreV1Client
+	return c.coreV1
 }
 
 // ExtensionsV1beta1 retrieves the ExtensionsV1beta1Client
 func (c *Clientset) ExtensionsV1beta1() extensionsv1beta1.ExtensionsV1beta1Interface {
-	return c.ExtensionsV1beta1Client
+	return c.extensionsV1beta1
 }
 
 // Deprecated: Extensions retrieves the default version of ExtensionsClient.
 // Please explicitly pick a version.
 func (c *Clientset) Extensions() extensionsv1beta1.ExtensionsV1beta1Interface {
-	return c.ExtensionsV1beta1Client
+	return c.extensionsV1beta1
 }
 
 // NetworkingV1 retrieves the NetworkingV1Client
 func (c *Clientset) NetworkingV1() networkingv1.NetworkingV1Interface {
-	return c.NetworkingV1Client
+	return c.networkingV1
 }
 
 // Deprecated: Networking retrieves the default version of NetworkingClient.
 // Please explicitly pick a version.
 func (c *Clientset) Networking() networkingv1.NetworkingV1Interface {
-	return c.NetworkingV1Client
+	return c.networkingV1
 }
 
 // PolicyV1beta1 retrieves the PolicyV1beta1Client
 func (c *Clientset) PolicyV1beta1() policyv1beta1.PolicyV1beta1Interface {
-	return c.PolicyV1beta1Client
+	return c.policyV1beta1
 }
 
 // Deprecated: Policy retrieves the default version of PolicyClient.
 // Please explicitly pick a version.
 func (c *Clientset) Policy() policyv1beta1.PolicyV1beta1Interface {
-	return c.PolicyV1beta1Client
+	return c.policyV1beta1
 }
 
 // RbacV1beta1 retrieves the RbacV1beta1Client
 func (c *Clientset) RbacV1beta1() rbacv1beta1.RbacV1beta1Interface {
-	return c.RbacV1beta1Client
+	return c.rbacV1beta1
 }
 
 // Deprecated: Rbac retrieves the default version of RbacClient.
 // Please explicitly pick a version.
 func (c *Clientset) Rbac() rbacv1beta1.RbacV1beta1Interface {
-	return c.RbacV1beta1Client
+	return c.rbacV1beta1
 }
 
 // RbacV1alpha1 retrieves the RbacV1alpha1Client
 func (c *Clientset) RbacV1alpha1() rbacv1alpha1.RbacV1alpha1Interface {
-	return c.RbacV1alpha1Client
+	return c.rbacV1alpha1
 }
 
 // SchedulingV1alpha1 retrieves the SchedulingV1alpha1Client
 func (c *Clientset) SchedulingV1alpha1() schedulingv1alpha1.SchedulingV1alpha1Interface {
-	return c.SchedulingV1alpha1Client
+	return c.schedulingV1alpha1
 }
 
 // Deprecated: Scheduling retrieves the default version of SchedulingClient.
 // Please explicitly pick a version.
 func (c *Clientset) Scheduling() schedulingv1alpha1.SchedulingV1alpha1Interface {
-	return c.SchedulingV1alpha1Client
+	return c.schedulingV1alpha1
 }
 
 // SettingsV1alpha1 retrieves the SettingsV1alpha1Client
 func (c *Clientset) SettingsV1alpha1() settingsv1alpha1.SettingsV1alpha1Interface {
-	return c.SettingsV1alpha1Client
+	return c.settingsV1alpha1
 }
 
 // Deprecated: Settings retrieves the default version of SettingsClient.
 // Please explicitly pick a version.
 func (c *Clientset) Settings() settingsv1alpha1.SettingsV1alpha1Interface {
-	return c.SettingsV1alpha1Client
+	return c.settingsV1alpha1
 }
 
 // StorageV1beta1 retrieves the StorageV1beta1Client
 func (c *Clientset) StorageV1beta1() storagev1beta1.StorageV1beta1Interface {
-	return c.StorageV1beta1Client
+	return c.storageV1beta1
 }
 
 // StorageV1 retrieves the StorageV1Client
 func (c *Clientset) StorageV1() storagev1.StorageV1Interface {
-	return c.StorageV1Client
+	return c.storageV1
 }
 
 // Deprecated: Storage retrieves the default version of StorageClient.
 // Please explicitly pick a version.
 func (c *Clientset) Storage() storagev1.StorageV1Interface {
-	return c.StorageV1Client
+	return c.storageV1
 }
 
 // Discovery retrieves the DiscoveryClient
@@ -345,91 +345,91 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
 	}
 	var cs Clientset
 	var err error
-	cs.AdmissionregistrationV1alpha1Client, err = admissionregistrationv1alpha1.NewForConfig(&configShallowCopy)
+	cs.admissionregistrationV1alpha1, err = admissionregistrationv1alpha1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.AppsV1beta1Client, err = appsv1beta1.NewForConfig(&configShallowCopy)
+	cs.appsV1beta1, err = appsv1beta1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.AppsV1beta2Client, err = appsv1beta2.NewForConfig(&configShallowCopy)
+	cs.appsV1beta2, err = appsv1beta2.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.AuthenticationV1Client, err = authenticationv1.NewForConfig(&configShallowCopy)
+	cs.authenticationV1, err = authenticationv1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.AuthenticationV1beta1Client, err = authenticationv1beta1.NewForConfig(&configShallowCopy)
+	cs.authenticationV1beta1, err = authenticationv1beta1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.AuthorizationV1Client, err = authorizationv1.NewForConfig(&configShallowCopy)
+	cs.authorizationV1, err = authorizationv1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.AuthorizationV1beta1Client, err = authorizationv1beta1.NewForConfig(&configShallowCopy)
+	cs.authorizationV1beta1, err = authorizationv1beta1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.AutoscalingV1Client, err = autoscalingv1.NewForConfig(&configShallowCopy)
+	cs.autoscalingV1, err = autoscalingv1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.AutoscalingV2alpha1Client, err = autoscalingv2alpha1.NewForConfig(&configShallowCopy)
+	cs.autoscalingV2alpha1, err = autoscalingv2alpha1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.BatchV1Client, err = batchv1.NewForConfig(&configShallowCopy)
+	cs.batchV1, err = batchv1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.BatchV2alpha1Client, err = batchv2alpha1.NewForConfig(&configShallowCopy)
+	cs.batchV2alpha1, err = batchv2alpha1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.CertificatesV1beta1Client, err = certificatesv1beta1.NewForConfig(&configShallowCopy)
+	cs.certificatesV1beta1, err = certificatesv1beta1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.CoreV1Client, err = corev1.NewForConfig(&configShallowCopy)
+	cs.coreV1, err = corev1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.ExtensionsV1beta1Client, err = extensionsv1beta1.NewForConfig(&configShallowCopy)
+	cs.extensionsV1beta1, err = extensionsv1beta1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.NetworkingV1Client, err = networkingv1.NewForConfig(&configShallowCopy)
+	cs.networkingV1, err = networkingv1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.PolicyV1beta1Client, err = policyv1beta1.NewForConfig(&configShallowCopy)
+	cs.policyV1beta1, err = policyv1beta1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.RbacV1beta1Client, err = rbacv1beta1.NewForConfig(&configShallowCopy)
+	cs.rbacV1beta1, err = rbacv1beta1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.RbacV1alpha1Client, err = rbacv1alpha1.NewForConfig(&configShallowCopy)
+	cs.rbacV1alpha1, err = rbacv1alpha1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.SchedulingV1alpha1Client, err = schedulingv1alpha1.NewForConfig(&configShallowCopy)
+	cs.schedulingV1alpha1, err = schedulingv1alpha1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.SettingsV1alpha1Client, err = settingsv1alpha1.NewForConfig(&configShallowCopy)
+	cs.settingsV1alpha1, err = settingsv1alpha1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.StorageV1beta1Client, err = storagev1beta1.NewForConfig(&configShallowCopy)
+	cs.storageV1beta1, err = storagev1beta1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
-	cs.StorageV1Client, err = storagev1.NewForConfig(&configShallowCopy)
+	cs.storageV1, err = storagev1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
@@ -446,28 +446,28 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
 // panics if there is an error in the config.
 func NewForConfigOrDie(c *rest.Config) *Clientset {
 	var cs Clientset
-	cs.AdmissionregistrationV1alpha1Client = admissionregistrationv1alpha1.NewForConfigOrDie(c)
+	cs.admissionregistrationV1alpha1 = admissionregistrationv1alpha1.NewForConfigOrDie(c)
-	cs.AppsV1beta1Client = appsv1beta1.NewForConfigOrDie(c)
+	cs.appsV1beta1 = appsv1beta1.NewForConfigOrDie(c)
-	cs.AppsV1beta2Client = appsv1beta2.NewForConfigOrDie(c)
+	cs.appsV1beta2 = appsv1beta2.NewForConfigOrDie(c)
-	cs.AuthenticationV1Client = authenticationv1.NewForConfigOrDie(c)
+	cs.authenticationV1 = authenticationv1.NewForConfigOrDie(c)
-	cs.AuthenticationV1beta1Client = authenticationv1beta1.NewForConfigOrDie(c)
+	cs.authenticationV1beta1 = authenticationv1beta1.NewForConfigOrDie(c)
-	cs.AuthorizationV1Client = authorizationv1.NewForConfigOrDie(c)
+	cs.authorizationV1 = authorizationv1.NewForConfigOrDie(c)
-	cs.AuthorizationV1beta1Client = authorizationv1beta1.NewForConfigOrDie(c)
+	cs.authorizationV1beta1 = authorizationv1beta1.NewForConfigOrDie(c)
-	cs.AutoscalingV1Client = autoscalingv1.NewForConfigOrDie(c)
+	cs.autoscalingV1 = autoscalingv1.NewForConfigOrDie(c)
-	cs.AutoscalingV2alpha1Client = autoscalingv2alpha1.NewForConfigOrDie(c)
+	cs.autoscalingV2alpha1 = autoscalingv2alpha1.NewForConfigOrDie(c)
-	cs.BatchV1Client = batchv1.NewForConfigOrDie(c)
+	cs.batchV1 = batchv1.NewForConfigOrDie(c)
-	cs.BatchV2alpha1Client = batchv2alpha1.NewForConfigOrDie(c)
+	cs.batchV2alpha1 = batchv2alpha1.NewForConfigOrDie(c)
-	cs.CertificatesV1beta1Client = certificatesv1beta1.NewForConfigOrDie(c)
+	cs.certificatesV1beta1 = certificatesv1beta1.NewForConfigOrDie(c)
-	cs.CoreV1Client = corev1.NewForConfigOrDie(c)
+	cs.coreV1 = corev1.NewForConfigOrDie(c)
-	cs.ExtensionsV1beta1Client = extensionsv1beta1.NewForConfigOrDie(c)
+	cs.extensionsV1beta1 = extensionsv1beta1.NewForConfigOrDie(c)
-	cs.NetworkingV1Client = networkingv1.NewForConfigOrDie(c)
+	cs.networkingV1 = networkingv1.NewForConfigOrDie(c)
-	cs.PolicyV1beta1Client = policyv1beta1.NewForConfigOrDie(c)
+	cs.policyV1beta1 = policyv1beta1.NewForConfigOrDie(c)
-	cs.RbacV1beta1Client = rbacv1beta1.NewForConfigOrDie(c)
+	cs.rbacV1beta1 = rbacv1beta1.NewForConfigOrDie(c)
-	cs.RbacV1alpha1Client = rbacv1alpha1.NewForConfigOrDie(c)
+	cs.rbacV1alpha1 = rbacv1alpha1.NewForConfigOrDie(c)
-	cs.SchedulingV1alpha1Client = schedulingv1alpha1.NewForConfigOrDie(c)
+	cs.schedulingV1alpha1 = schedulingv1alpha1.NewForConfigOrDie(c)
-	cs.SettingsV1alpha1Client = settingsv1alpha1.NewForConfigOrDie(c)
+	cs.settingsV1alpha1 = settingsv1alpha1.NewForConfigOrDie(c)
-	cs.StorageV1beta1Client = storagev1beta1.NewForConfigOrDie(c)
+	cs.storageV1beta1 = storagev1beta1.NewForConfigOrDie(c)
-	cs.StorageV1Client = storagev1.NewForConfigOrDie(c)
+	cs.storageV1 = storagev1.NewForConfigOrDie(c)
 
 	cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c)
 	return &cs
@@ -476,28 +476,28 @@ func NewForConfigOrDie(c *rest.Config) *Clientset {
 // New creates a new Clientset for the given RESTClient.
 func New(c rest.Interface) *Clientset {
 	var cs Clientset
-	cs.AdmissionregistrationV1alpha1Client = admissionregistrationv1alpha1.New(c)
+	cs.admissionregistrationV1alpha1 = admissionregistrationv1alpha1.New(c)
-	cs.AppsV1beta1Client = appsv1beta1.New(c)
+	cs.appsV1beta1 = appsv1beta1.New(c)
-	cs.AppsV1beta2Client = appsv1beta2.New(c)
+	cs.appsV1beta2 = appsv1beta2.New(c)
-	cs.AuthenticationV1Client = authenticationv1.New(c)
+	cs.authenticationV1 = authenticationv1.New(c)
-	cs.AuthenticationV1beta1Client = authenticationv1beta1.New(c)
+	cs.authenticationV1beta1 = authenticationv1beta1.New(c)
-	cs.AuthorizationV1Client = authorizationv1.New(c)
+	cs.authorizationV1 = authorizationv1.New(c)
-	cs.AuthorizationV1beta1Client = authorizationv1beta1.New(c)
+	cs.authorizationV1beta1 = authorizationv1beta1.New(c)
-	cs.AutoscalingV1Client = autoscalingv1.New(c)
+	cs.autoscalingV1 = autoscalingv1.New(c)
-	cs.AutoscalingV2alpha1Client = autoscalingv2alpha1.New(c)
+	cs.autoscalingV2alpha1 = autoscalingv2alpha1.New(c)
-	cs.BatchV1Client = batchv1.New(c)
+	cs.batchV1 = batchv1.New(c)
-	cs.BatchV2alpha1Client = batchv2alpha1.New(c)
+	cs.batchV2alpha1 = batchv2alpha1.New(c)
-	cs.CertificatesV1beta1Client = certificatesv1beta1.New(c)
+	cs.certificatesV1beta1 = certificatesv1beta1.New(c)
-	cs.CoreV1Client = corev1.New(c)
+	cs.coreV1 = corev1.New(c)
-	cs.ExtensionsV1beta1Client = extensionsv1beta1.New(c)
+	cs.extensionsV1beta1 = extensionsv1beta1.New(c)
-	cs.NetworkingV1Client = networkingv1.New(c)
+	cs.networkingV1 = networkingv1.New(c)
-	cs.PolicyV1beta1Client = policyv1beta1.New(c)
+	cs.policyV1beta1 = policyv1beta1.New(c)
-	cs.RbacV1beta1Client = rbacv1beta1.New(c)
+	cs.rbacV1beta1 = rbacv1beta1.New(c)
-	cs.RbacV1alpha1Client = rbacv1alpha1.New(c)
+	cs.rbacV1alpha1 = rbacv1alpha1.New(c)
-	cs.SchedulingV1alpha1Client = schedulingv1alpha1.New(c)
+	cs.schedulingV1alpha1 = schedulingv1alpha1.New(c)
-	cs.SettingsV1alpha1Client = settingsv1alpha1.New(c)
+	cs.settingsV1alpha1 = settingsv1alpha1.New(c)
-	cs.StorageV1beta1Client = storagev1beta1.New(c)
+	cs.storageV1beta1 = storagev1beta1.New(c)
-	cs.StorageV1Client = storagev1.New(c)
+	cs.storageV1 = storagev1.New(c)
 
 	cs.DiscoveryClient = discovery.NewDiscoveryClient(c)
 	return &cs