From 3b310d8989e2b20b91898b9304f42f94175b877d Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Fri, 21 Jul 2017 12:35:25 +0200 Subject: [PATCH] Update generated code --- cmd/kubeadm/app/phases/markmaster/BUILD | 1 - .../federation_clientset/clientset.go | 60 ++--- .../internalclientset/clientset.go | 150 +++++------ pkg/kubectl/BUILD | 2 - pkg/printers/internalversion/BUILD | 2 - .../client/clientset/clientset/clientset.go | 12 +- .../clientset/internalclientset/clientset.go | 10 +- .../k8s.io/client-go/kubernetes/clientset.go | 250 +++++++++--------- .../clientset/clientset.go | 12 +- .../internalclientset/clientset.go | 10 +- .../test/clientset/internal/clientset.go | 10 +- .../test/clientset/versioned/clientset.go | 12 +- .../clientset/clientset.go | 12 +- .../clientset/clientset.go | 12 +- .../internalclientset/clientset.go | 10 +- 15 files changed, 280 insertions(+), 285 deletions(-) diff --git a/cmd/kubeadm/app/phases/markmaster/BUILD b/cmd/kubeadm/app/phases/markmaster/BUILD index d611e941a36..7495e2bc1f9 100644 --- a/cmd/kubeadm/app/phases/markmaster/BUILD +++ b/cmd/kubeadm/app/phases/markmaster/BUILD @@ -20,7 +20,6 @@ go_test( "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", - "//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", ], ) diff --git a/federation/client/clientset_generated/federation_clientset/clientset.go b/federation/client/clientset_generated/federation_clientset/clientset.go index b77b2dbb341..38b461c111a 100644 --- a/federation/client/clientset_generated/federation_clientset/clientset.go +++ b/federation/client/clientset_generated/federation_clientset/clientset.go @@ -51,66 +51,66 @@ type Interface interface { // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *autoscalingv1.AutoscalingV1Client - *batchv1.BatchV1Client - *corev1.CoreV1Client - *extensionsv1beta1.ExtensionsV1beta1Client - *federationv1beta1.FederationV1beta1Client + autoscalingV1 *autoscalingv1.AutoscalingV1Client + batchV1 *batchv1.BatchV1Client + coreV1 *corev1.CoreV1Client + extensionsV1beta1 *extensionsv1beta1.ExtensionsV1beta1Client + federationV1beta1 *federationv1beta1.FederationV1beta1Client } // 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 } // 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 } // 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 } // FederationV1beta1 retrieves the FederationV1beta1Client func (c *Clientset) FederationV1beta1() federationv1beta1.FederationV1beta1Interface { - return c.FederationV1beta1Client + return c.federationV1beta1 } // Deprecated: Federation retrieves the default version of FederationClient. // Please explicitly pick a version. func (c *Clientset) Federation() federationv1beta1.FederationV1beta1Interface { - return c.FederationV1beta1Client + return c.federationV1beta1 } // Discovery retrieves the DiscoveryClient @@ -129,23 +129,23 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.AutoscalingV1Client, err = autoscalingv1.NewForConfig(&configShallowCopy) + cs.autoscalingV1, err = autoscalingv1.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.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.FederationV1beta1Client, err = federationv1beta1.NewForConfig(&configShallowCopy) + cs.federationV1beta1, err = federationv1beta1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -162,11 +162,11 @@ 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.AutoscalingV1Client = autoscalingv1.NewForConfigOrDie(c) - cs.BatchV1Client = batchv1.NewForConfigOrDie(c) - cs.CoreV1Client = corev1.NewForConfigOrDie(c) - cs.ExtensionsV1beta1Client = extensionsv1beta1.NewForConfigOrDie(c) - cs.FederationV1beta1Client = federationv1beta1.NewForConfigOrDie(c) + cs.autoscalingV1 = autoscalingv1.NewForConfigOrDie(c) + cs.batchV1 = batchv1.NewForConfigOrDie(c) + cs.coreV1 = corev1.NewForConfigOrDie(c) + cs.extensionsV1beta1 = extensionsv1beta1.NewForConfigOrDie(c) + cs.federationV1beta1 = federationv1beta1.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -175,11 +175,11 @@ 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.AutoscalingV1Client = autoscalingv1.New(c) - cs.BatchV1Client = batchv1.New(c) - cs.CoreV1Client = corev1.New(c) - cs.ExtensionsV1beta1Client = extensionsv1beta1.New(c) - cs.FederationV1beta1Client = federationv1beta1.New(c) + cs.autoscalingV1 = autoscalingv1.New(c) + cs.batchV1 = batchv1.New(c) + cs.coreV1 = corev1.New(c) + cs.extensionsV1beta1 = extensionsv1beta1.New(c) + cs.federationV1beta1 = federationv1beta1.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/pkg/client/clientset_generated/internalclientset/clientset.go b/pkg/client/clientset_generated/internalclientset/clientset.go index 0fab4ccdc4e..c7eb9d437ca 100644 --- a/pkg/client/clientset_generated/internalclientset/clientset.go +++ b/pkg/client/clientset_generated/internalclientset/clientset.go @@ -61,96 +61,96 @@ type Interface interface { // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *admissionregistrationinternalversion.AdmissionregistrationClient - *coreinternalversion.CoreClient - *appsinternalversion.AppsClient - *authenticationinternalversion.AuthenticationClient - *authorizationinternalversion.AuthorizationClient - *autoscalinginternalversion.AutoscalingClient - *batchinternalversion.BatchClient - *certificatesinternalversion.CertificatesClient - *extensionsinternalversion.ExtensionsClient - *networkinginternalversion.NetworkingClient - *policyinternalversion.PolicyClient - *rbacinternalversion.RbacClient - *schedulinginternalversion.SchedulingClient - *settingsinternalversion.SettingsClient - *storageinternalversion.StorageClient + admissionregistration *admissionregistrationinternalversion.AdmissionregistrationClient + core *coreinternalversion.CoreClient + apps *appsinternalversion.AppsClient + authentication *authenticationinternalversion.AuthenticationClient + authorization *authorizationinternalversion.AuthorizationClient + autoscaling *autoscalinginternalversion.AutoscalingClient + batch *batchinternalversion.BatchClient + certificates *certificatesinternalversion.CertificatesClient + extensions *extensionsinternalversion.ExtensionsClient + networking *networkinginternalversion.NetworkingClient + policy *policyinternalversion.PolicyClient + rbac *rbacinternalversion.RbacClient + scheduling *schedulinginternalversion.SchedulingClient + settings *settingsinternalversion.SettingsClient + storage *storageinternalversion.StorageClient } // Admissionregistration retrieves the AdmissionregistrationClient func (c *Clientset) Admissionregistration() admissionregistrationinternalversion.AdmissionregistrationInterface { - return c.AdmissionregistrationClient + return c.admissionregistration } // Core retrieves the CoreClient func (c *Clientset) Core() coreinternalversion.CoreInterface { - return c.CoreClient + return c.core } // Apps retrieves the AppsClient func (c *Clientset) Apps() appsinternalversion.AppsInterface { - return c.AppsClient + return c.apps } // Authentication retrieves the AuthenticationClient func (c *Clientset) Authentication() authenticationinternalversion.AuthenticationInterface { - return c.AuthenticationClient + return c.authentication } // Authorization retrieves the AuthorizationClient func (c *Clientset) Authorization() authorizationinternalversion.AuthorizationInterface { - return c.AuthorizationClient + return c.authorization } // Autoscaling retrieves the AutoscalingClient func (c *Clientset) Autoscaling() autoscalinginternalversion.AutoscalingInterface { - return c.AutoscalingClient + return c.autoscaling } // Batch retrieves the BatchClient func (c *Clientset) Batch() batchinternalversion.BatchInterface { - return c.BatchClient + return c.batch } // Certificates retrieves the CertificatesClient func (c *Clientset) Certificates() certificatesinternalversion.CertificatesInterface { - return c.CertificatesClient + return c.certificates } // Extensions retrieves the ExtensionsClient func (c *Clientset) Extensions() extensionsinternalversion.ExtensionsInterface { - return c.ExtensionsClient + return c.extensions } // Networking retrieves the NetworkingClient func (c *Clientset) Networking() networkinginternalversion.NetworkingInterface { - return c.NetworkingClient + return c.networking } // Policy retrieves the PolicyClient func (c *Clientset) Policy() policyinternalversion.PolicyInterface { - return c.PolicyClient + return c.policy } // Rbac retrieves the RbacClient func (c *Clientset) Rbac() rbacinternalversion.RbacInterface { - return c.RbacClient + return c.rbac } // Scheduling retrieves the SchedulingClient func (c *Clientset) Scheduling() schedulinginternalversion.SchedulingInterface { - return c.SchedulingClient + return c.scheduling } // Settings retrieves the SettingsClient func (c *Clientset) Settings() settingsinternalversion.SettingsInterface { - return c.SettingsClient + return c.settings } // Storage retrieves the StorageClient func (c *Clientset) Storage() storageinternalversion.StorageInterface { - return c.StorageClient + return c.storage } // Discovery retrieves the DiscoveryClient @@ -169,63 +169,63 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.AdmissionregistrationClient, err = admissionregistrationinternalversion.NewForConfig(&configShallowCopy) + cs.admissionregistration, err = admissionregistrationinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.CoreClient, err = coreinternalversion.NewForConfig(&configShallowCopy) + cs.core, err = coreinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.AppsClient, err = appsinternalversion.NewForConfig(&configShallowCopy) + cs.apps, err = appsinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.AuthenticationClient, err = authenticationinternalversion.NewForConfig(&configShallowCopy) + cs.authentication, err = authenticationinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.AuthorizationClient, err = authorizationinternalversion.NewForConfig(&configShallowCopy) + cs.authorization, err = authorizationinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.AutoscalingClient, err = autoscalinginternalversion.NewForConfig(&configShallowCopy) + cs.autoscaling, err = autoscalinginternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.BatchClient, err = batchinternalversion.NewForConfig(&configShallowCopy) + cs.batch, err = batchinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.CertificatesClient, err = certificatesinternalversion.NewForConfig(&configShallowCopy) + cs.certificates, err = certificatesinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.ExtensionsClient, err = extensionsinternalversion.NewForConfig(&configShallowCopy) + cs.extensions, err = extensionsinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.NetworkingClient, err = networkinginternalversion.NewForConfig(&configShallowCopy) + cs.networking, err = networkinginternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.PolicyClient, err = policyinternalversion.NewForConfig(&configShallowCopy) + cs.policy, err = policyinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.RbacClient, err = rbacinternalversion.NewForConfig(&configShallowCopy) + cs.rbac, err = rbacinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.SchedulingClient, err = schedulinginternalversion.NewForConfig(&configShallowCopy) + cs.scheduling, err = schedulinginternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.SettingsClient, err = settingsinternalversion.NewForConfig(&configShallowCopy) + cs.settings, err = settingsinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.StorageClient, err = storageinternalversion.NewForConfig(&configShallowCopy) + cs.storage, err = storageinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -242,21 +242,21 @@ 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.AdmissionregistrationClient = admissionregistrationinternalversion.NewForConfigOrDie(c) - cs.CoreClient = coreinternalversion.NewForConfigOrDie(c) - cs.AppsClient = appsinternalversion.NewForConfigOrDie(c) - cs.AuthenticationClient = authenticationinternalversion.NewForConfigOrDie(c) - cs.AuthorizationClient = authorizationinternalversion.NewForConfigOrDie(c) - cs.AutoscalingClient = autoscalinginternalversion.NewForConfigOrDie(c) - cs.BatchClient = batchinternalversion.NewForConfigOrDie(c) - cs.CertificatesClient = certificatesinternalversion.NewForConfigOrDie(c) - cs.ExtensionsClient = extensionsinternalversion.NewForConfigOrDie(c) - cs.NetworkingClient = networkinginternalversion.NewForConfigOrDie(c) - cs.PolicyClient = policyinternalversion.NewForConfigOrDie(c) - cs.RbacClient = rbacinternalversion.NewForConfigOrDie(c) - cs.SchedulingClient = schedulinginternalversion.NewForConfigOrDie(c) - cs.SettingsClient = settingsinternalversion.NewForConfigOrDie(c) - cs.StorageClient = storageinternalversion.NewForConfigOrDie(c) + cs.admissionregistration = admissionregistrationinternalversion.NewForConfigOrDie(c) + cs.core = coreinternalversion.NewForConfigOrDie(c) + cs.apps = appsinternalversion.NewForConfigOrDie(c) + cs.authentication = authenticationinternalversion.NewForConfigOrDie(c) + cs.authorization = authorizationinternalversion.NewForConfigOrDie(c) + cs.autoscaling = autoscalinginternalversion.NewForConfigOrDie(c) + cs.batch = batchinternalversion.NewForConfigOrDie(c) + cs.certificates = certificatesinternalversion.NewForConfigOrDie(c) + cs.extensions = extensionsinternalversion.NewForConfigOrDie(c) + cs.networking = networkinginternalversion.NewForConfigOrDie(c) + cs.policy = policyinternalversion.NewForConfigOrDie(c) + cs.rbac = rbacinternalversion.NewForConfigOrDie(c) + cs.scheduling = schedulinginternalversion.NewForConfigOrDie(c) + cs.settings = settingsinternalversion.NewForConfigOrDie(c) + cs.storage = storageinternalversion.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -265,21 +265,21 @@ 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.AdmissionregistrationClient = admissionregistrationinternalversion.New(c) - cs.CoreClient = coreinternalversion.New(c) - cs.AppsClient = appsinternalversion.New(c) - cs.AuthenticationClient = authenticationinternalversion.New(c) - cs.AuthorizationClient = authorizationinternalversion.New(c) - cs.AutoscalingClient = autoscalinginternalversion.New(c) - cs.BatchClient = batchinternalversion.New(c) - cs.CertificatesClient = certificatesinternalversion.New(c) - cs.ExtensionsClient = extensionsinternalversion.New(c) - cs.NetworkingClient = networkinginternalversion.New(c) - cs.PolicyClient = policyinternalversion.New(c) - cs.RbacClient = rbacinternalversion.New(c) - cs.SchedulingClient = schedulinginternalversion.New(c) - cs.SettingsClient = settingsinternalversion.New(c) - cs.StorageClient = storageinternalversion.New(c) + cs.admissionregistration = admissionregistrationinternalversion.New(c) + cs.core = coreinternalversion.New(c) + cs.apps = appsinternalversion.New(c) + cs.authentication = authenticationinternalversion.New(c) + cs.authorization = authorizationinternalversion.New(c) + cs.autoscaling = autoscalinginternalversion.New(c) + cs.batch = batchinternalversion.New(c) + cs.certificates = certificatesinternalversion.New(c) + cs.extensions = extensionsinternalversion.New(c) + cs.networking = networkinginternalversion.New(c) + cs.policy = policyinternalversion.New(c) + cs.rbac = rbacinternalversion.New(c) + cs.scheduling = schedulinginternalversion.New(c) + cs.settings = settingsinternalversion.New(c) + cs.storage = storageinternalversion.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index 52a40a1c946..7ba148beb69 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -172,9 +172,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/validation:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", - "//vendor/k8s.io/client-go/kubernetes:go_default_library", "//vendor/k8s.io/client-go/kubernetes/typed/apps/v1beta1:go_default_library", - "//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//vendor/k8s.io/client-go/kubernetes/typed/extensions/v1beta1:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/util/integer:go_default_library", diff --git a/pkg/printers/internalversion/BUILD b/pkg/printers/internalversion/BUILD index 965d2a4a23c..5b2f410bd20 100644 --- a/pkg/printers/internalversion/BUILD +++ b/pkg/printers/internalversion/BUILD @@ -112,8 +112,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/client-go/dynamic:go_default_library", - "//vendor/k8s.io/client-go/kubernetes:go_default_library", - "//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//vendor/k8s.io/client-go/kubernetes/typed/extensions/v1beta1:go_default_library", ], ) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/clientset.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/clientset.go index 0fb66d22e2d..bae98c78bf3 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/clientset.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/clientset.go @@ -35,18 +35,18 @@ type Interface interface { // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *apiextensionsv1beta1.ApiextensionsV1beta1Client + apiextensionsV1beta1 *apiextensionsv1beta1.ApiextensionsV1beta1Client } // ApiextensionsV1beta1 retrieves the ApiextensionsV1beta1Client func (c *Clientset) ApiextensionsV1beta1() apiextensionsv1beta1.ApiextensionsV1beta1Interface { - return c.ApiextensionsV1beta1Client + return c.apiextensionsV1beta1 } // Deprecated: Apiextensions retrieves the default version of ApiextensionsClient. // Please explicitly pick a version. func (c *Clientset) Apiextensions() apiextensionsv1beta1.ApiextensionsV1beta1Interface { - return c.ApiextensionsV1beta1Client + return c.apiextensionsV1beta1 } // Discovery retrieves the DiscoveryClient @@ -65,7 +65,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.ApiextensionsV1beta1Client, err = apiextensionsv1beta1.NewForConfig(&configShallowCopy) + cs.apiextensionsV1beta1, err = apiextensionsv1beta1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -82,7 +82,7 @@ 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.ApiextensionsV1beta1Client = apiextensionsv1beta1.NewForConfigOrDie(c) + cs.apiextensionsV1beta1 = apiextensionsv1beta1.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -91,7 +91,7 @@ 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.ApiextensionsV1beta1Client = apiextensionsv1beta1.New(c) + cs.apiextensionsV1beta1 = apiextensionsv1beta1.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/clientset.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/clientset.go index 1037f476e32..72803e76923 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/clientset.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/clientset.go @@ -33,12 +33,12 @@ type Interface interface { // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *apiextensionsinternalversion.ApiextensionsClient + apiextensions *apiextensionsinternalversion.ApiextensionsClient } // Apiextensions retrieves the ApiextensionsClient func (c *Clientset) Apiextensions() apiextensionsinternalversion.ApiextensionsInterface { - return c.ApiextensionsClient + return c.apiextensions } // Discovery retrieves the DiscoveryClient @@ -57,7 +57,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.ApiextensionsClient, err = apiextensionsinternalversion.NewForConfig(&configShallowCopy) + cs.apiextensions, err = apiextensionsinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -74,7 +74,7 @@ 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.ApiextensionsClient = apiextensionsinternalversion.NewForConfigOrDie(c) + cs.apiextensions = apiextensionsinternalversion.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -83,7 +83,7 @@ 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.ApiextensionsClient = apiextensionsinternalversion.New(c) + cs.apiextensions = apiextensionsinternalversion.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/staging/src/k8s.io/client-go/kubernetes/clientset.go b/staging/src/k8s.io/client-go/kubernetes/clientset.go index 8eeef78c2a7..a22cf6534fe 100644 --- a/staging/src/k8s.io/client-go/kubernetes/clientset.go +++ b/staging/src/k8s.io/client-go/kubernetes/clientset.go @@ -105,228 +105,228 @@ type Interface interface { // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *admissionregistrationv1alpha1.AdmissionregistrationV1alpha1Client - *appsv1beta1.AppsV1beta1Client - *appsv1beta2.AppsV1beta2Client - *authenticationv1.AuthenticationV1Client - *authenticationv1beta1.AuthenticationV1beta1Client - *authorizationv1.AuthorizationV1Client - *authorizationv1beta1.AuthorizationV1beta1Client - *autoscalingv1.AutoscalingV1Client - *autoscalingv2alpha1.AutoscalingV2alpha1Client - *batchv1.BatchV1Client - *batchv2alpha1.BatchV2alpha1Client - *certificatesv1beta1.CertificatesV1beta1Client - *corev1.CoreV1Client - *extensionsv1beta1.ExtensionsV1beta1Client - *networkingv1.NetworkingV1Client - *policyv1beta1.PolicyV1beta1Client - *rbacv1beta1.RbacV1beta1Client - *rbacv1alpha1.RbacV1alpha1Client - *schedulingv1alpha1.SchedulingV1alpha1Client - *settingsv1alpha1.SettingsV1alpha1Client - *storagev1beta1.StorageV1beta1Client - *storagev1.StorageV1Client + admissionregistrationV1alpha1 *admissionregistrationv1alpha1.AdmissionregistrationV1alpha1Client + appsV1beta1 *appsv1beta1.AppsV1beta1Client + appsV1beta2 *appsv1beta2.AppsV1beta2Client + authenticationV1 *authenticationv1.AuthenticationV1Client + authenticationV1beta1 *authenticationv1beta1.AuthenticationV1beta1Client + authorizationV1 *authorizationv1.AuthorizationV1Client + authorizationV1beta1 *authorizationv1beta1.AuthorizationV1beta1Client + autoscalingV1 *autoscalingv1.AutoscalingV1Client + autoscalingV2alpha1 *autoscalingv2alpha1.AutoscalingV2alpha1Client + batchV1 *batchv1.BatchV1Client + batchV2alpha1 *batchv2alpha1.BatchV2alpha1Client + certificatesV1beta1 *certificatesv1beta1.CertificatesV1beta1Client + coreV1 *corev1.CoreV1Client + extensionsV1beta1 *extensionsv1beta1.ExtensionsV1beta1Client + networkingV1 *networkingv1.NetworkingV1Client + policyV1beta1 *policyv1beta1.PolicyV1beta1Client + rbacV1beta1 *rbacv1beta1.RbacV1beta1Client + rbacV1alpha1 *rbacv1alpha1.RbacV1alpha1Client + schedulingV1alpha1 *schedulingv1alpha1.SchedulingV1alpha1Client + settingsV1alpha1 *settingsv1alpha1.SettingsV1alpha1Client + storageV1beta1 *storagev1beta1.StorageV1beta1Client + 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.AppsV1beta1Client = appsv1beta1.NewForConfigOrDie(c) - cs.AppsV1beta2Client = appsv1beta2.NewForConfigOrDie(c) - cs.AuthenticationV1Client = authenticationv1.NewForConfigOrDie(c) - cs.AuthenticationV1beta1Client = authenticationv1beta1.NewForConfigOrDie(c) - cs.AuthorizationV1Client = authorizationv1.NewForConfigOrDie(c) - cs.AuthorizationV1beta1Client = authorizationv1beta1.NewForConfigOrDie(c) - cs.AutoscalingV1Client = autoscalingv1.NewForConfigOrDie(c) - cs.AutoscalingV2alpha1Client = autoscalingv2alpha1.NewForConfigOrDie(c) - cs.BatchV1Client = batchv1.NewForConfigOrDie(c) - cs.BatchV2alpha1Client = batchv2alpha1.NewForConfigOrDie(c) - cs.CertificatesV1beta1Client = certificatesv1beta1.NewForConfigOrDie(c) - cs.CoreV1Client = corev1.NewForConfigOrDie(c) - cs.ExtensionsV1beta1Client = extensionsv1beta1.NewForConfigOrDie(c) - cs.NetworkingV1Client = networkingv1.NewForConfigOrDie(c) - cs.PolicyV1beta1Client = policyv1beta1.NewForConfigOrDie(c) - cs.RbacV1beta1Client = rbacv1beta1.NewForConfigOrDie(c) - cs.RbacV1alpha1Client = rbacv1alpha1.NewForConfigOrDie(c) - cs.SchedulingV1alpha1Client = schedulingv1alpha1.NewForConfigOrDie(c) - cs.SettingsV1alpha1Client = settingsv1alpha1.NewForConfigOrDie(c) - cs.StorageV1beta1Client = storagev1beta1.NewForConfigOrDie(c) - cs.StorageV1Client = storagev1.NewForConfigOrDie(c) + cs.admissionregistrationV1alpha1 = admissionregistrationv1alpha1.NewForConfigOrDie(c) + cs.appsV1beta1 = appsv1beta1.NewForConfigOrDie(c) + cs.appsV1beta2 = appsv1beta2.NewForConfigOrDie(c) + cs.authenticationV1 = authenticationv1.NewForConfigOrDie(c) + cs.authenticationV1beta1 = authenticationv1beta1.NewForConfigOrDie(c) + cs.authorizationV1 = authorizationv1.NewForConfigOrDie(c) + cs.authorizationV1beta1 = authorizationv1beta1.NewForConfigOrDie(c) + cs.autoscalingV1 = autoscalingv1.NewForConfigOrDie(c) + cs.autoscalingV2alpha1 = autoscalingv2alpha1.NewForConfigOrDie(c) + cs.batchV1 = batchv1.NewForConfigOrDie(c) + cs.batchV2alpha1 = batchv2alpha1.NewForConfigOrDie(c) + cs.certificatesV1beta1 = certificatesv1beta1.NewForConfigOrDie(c) + cs.coreV1 = corev1.NewForConfigOrDie(c) + cs.extensionsV1beta1 = extensionsv1beta1.NewForConfigOrDie(c) + cs.networkingV1 = networkingv1.NewForConfigOrDie(c) + cs.policyV1beta1 = policyv1beta1.NewForConfigOrDie(c) + cs.rbacV1beta1 = rbacv1beta1.NewForConfigOrDie(c) + cs.rbacV1alpha1 = rbacv1alpha1.NewForConfigOrDie(c) + cs.schedulingV1alpha1 = schedulingv1alpha1.NewForConfigOrDie(c) + cs.settingsV1alpha1 = settingsv1alpha1.NewForConfigOrDie(c) + cs.storageV1beta1 = storagev1beta1.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.AppsV1beta1Client = appsv1beta1.New(c) - cs.AppsV1beta2Client = appsv1beta2.New(c) - cs.AuthenticationV1Client = authenticationv1.New(c) - cs.AuthenticationV1beta1Client = authenticationv1beta1.New(c) - cs.AuthorizationV1Client = authorizationv1.New(c) - cs.AuthorizationV1beta1Client = authorizationv1beta1.New(c) - cs.AutoscalingV1Client = autoscalingv1.New(c) - cs.AutoscalingV2alpha1Client = autoscalingv2alpha1.New(c) - cs.BatchV1Client = batchv1.New(c) - cs.BatchV2alpha1Client = batchv2alpha1.New(c) - cs.CertificatesV1beta1Client = certificatesv1beta1.New(c) - cs.CoreV1Client = corev1.New(c) - cs.ExtensionsV1beta1Client = extensionsv1beta1.New(c) - cs.NetworkingV1Client = networkingv1.New(c) - cs.PolicyV1beta1Client = policyv1beta1.New(c) - cs.RbacV1beta1Client = rbacv1beta1.New(c) - cs.RbacV1alpha1Client = rbacv1alpha1.New(c) - cs.SchedulingV1alpha1Client = schedulingv1alpha1.New(c) - cs.SettingsV1alpha1Client = settingsv1alpha1.New(c) - cs.StorageV1beta1Client = storagev1beta1.New(c) - cs.StorageV1Client = storagev1.New(c) + cs.admissionregistrationV1alpha1 = admissionregistrationv1alpha1.New(c) + cs.appsV1beta1 = appsv1beta1.New(c) + cs.appsV1beta2 = appsv1beta2.New(c) + cs.authenticationV1 = authenticationv1.New(c) + cs.authenticationV1beta1 = authenticationv1beta1.New(c) + cs.authorizationV1 = authorizationv1.New(c) + cs.authorizationV1beta1 = authorizationv1beta1.New(c) + cs.autoscalingV1 = autoscalingv1.New(c) + cs.autoscalingV2alpha1 = autoscalingv2alpha1.New(c) + cs.batchV1 = batchv1.New(c) + cs.batchV2alpha1 = batchv2alpha1.New(c) + cs.certificatesV1beta1 = certificatesv1beta1.New(c) + cs.coreV1 = corev1.New(c) + cs.extensionsV1beta1 = extensionsv1beta1.New(c) + cs.networkingV1 = networkingv1.New(c) + cs.policyV1beta1 = policyv1beta1.New(c) + cs.rbacV1beta1 = rbacv1beta1.New(c) + cs.rbacV1alpha1 = rbacv1alpha1.New(c) + cs.schedulingV1alpha1 = schedulingv1alpha1.New(c) + cs.settingsV1alpha1 = settingsv1alpha1.New(c) + cs.storageV1beta1 = storagev1beta1.New(c) + cs.storageV1 = storagev1.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go index 3bc61ba394b..2770ab732a9 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go @@ -35,18 +35,18 @@ type Interface interface { // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *apiregistrationv1beta1.ApiregistrationV1beta1Client + apiregistrationV1beta1 *apiregistrationv1beta1.ApiregistrationV1beta1Client } // ApiregistrationV1beta1 retrieves the ApiregistrationV1beta1Client func (c *Clientset) ApiregistrationV1beta1() apiregistrationv1beta1.ApiregistrationV1beta1Interface { - return c.ApiregistrationV1beta1Client + return c.apiregistrationV1beta1 } // Deprecated: Apiregistration retrieves the default version of ApiregistrationClient. // Please explicitly pick a version. func (c *Clientset) Apiregistration() apiregistrationv1beta1.ApiregistrationV1beta1Interface { - return c.ApiregistrationV1beta1Client + return c.apiregistrationV1beta1 } // Discovery retrieves the DiscoveryClient @@ -65,7 +65,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.ApiregistrationV1beta1Client, err = apiregistrationv1beta1.NewForConfig(&configShallowCopy) + cs.apiregistrationV1beta1, err = apiregistrationv1beta1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -82,7 +82,7 @@ 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.ApiregistrationV1beta1Client = apiregistrationv1beta1.NewForConfigOrDie(c) + cs.apiregistrationV1beta1 = apiregistrationv1beta1.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -91,7 +91,7 @@ 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.ApiregistrationV1beta1Client = apiregistrationv1beta1.New(c) + cs.apiregistrationV1beta1 = apiregistrationv1beta1.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go index 92a3ecb252b..1c16da25441 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go @@ -33,12 +33,12 @@ type Interface interface { // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *apiregistrationinternalversion.ApiregistrationClient + apiregistration *apiregistrationinternalversion.ApiregistrationClient } // Apiregistration retrieves the ApiregistrationClient func (c *Clientset) Apiregistration() apiregistrationinternalversion.ApiregistrationInterface { - return c.ApiregistrationClient + return c.apiregistration } // Discovery retrieves the DiscoveryClient @@ -57,7 +57,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.ApiregistrationClient, err = apiregistrationinternalversion.NewForConfig(&configShallowCopy) + cs.apiregistration, err = apiregistrationinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -74,7 +74,7 @@ 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.ApiregistrationClient = apiregistrationinternalversion.NewForConfigOrDie(c) + cs.apiregistration = apiregistrationinternalversion.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -83,7 +83,7 @@ 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.ApiregistrationClient = apiregistrationinternalversion.New(c) + cs.apiregistration = apiregistrationinternalversion.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/staging/src/k8s.io/kube-gen/test/clientset/internal/clientset.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/clientset.go index a5582812224..2046acba1ce 100644 --- a/staging/src/k8s.io/kube-gen/test/clientset/internal/clientset.go +++ b/staging/src/k8s.io/kube-gen/test/clientset/internal/clientset.go @@ -33,12 +33,12 @@ type Interface interface { // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *testgroupinternalversion.TestgroupClient + testgroup *testgroupinternalversion.TestgroupClient } // Testgroup retrieves the TestgroupClient func (c *Clientset) Testgroup() testgroupinternalversion.TestgroupInterface { - return c.TestgroupClient + return c.testgroup } // Discovery retrieves the DiscoveryClient @@ -57,7 +57,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.TestgroupClient, err = testgroupinternalversion.NewForConfig(&configShallowCopy) + cs.testgroup, err = testgroupinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -74,7 +74,7 @@ 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.TestgroupClient = testgroupinternalversion.NewForConfigOrDie(c) + cs.testgroup = testgroupinternalversion.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -83,7 +83,7 @@ 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.TestgroupClient = testgroupinternalversion.New(c) + cs.testgroup = testgroupinternalversion.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/staging/src/k8s.io/kube-gen/test/clientset/versioned/clientset.go b/staging/src/k8s.io/kube-gen/test/clientset/versioned/clientset.go index 9a5615393a3..709bb6418e3 100644 --- a/staging/src/k8s.io/kube-gen/test/clientset/versioned/clientset.go +++ b/staging/src/k8s.io/kube-gen/test/clientset/versioned/clientset.go @@ -35,18 +35,18 @@ type Interface interface { // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *testgroupv1.TestgroupV1Client + testgroupV1 *testgroupv1.TestgroupV1Client } // TestgroupV1 retrieves the TestgroupV1Client func (c *Clientset) TestgroupV1() testgroupv1.TestgroupV1Interface { - return c.TestgroupV1Client + return c.testgroupV1 } // Deprecated: Testgroup retrieves the default version of TestgroupClient. // Please explicitly pick a version. func (c *Clientset) Testgroup() testgroupv1.TestgroupV1Interface { - return c.TestgroupV1Client + return c.testgroupV1 } // Discovery retrieves the DiscoveryClient @@ -65,7 +65,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.TestgroupV1Client, err = testgroupv1.NewForConfig(&configShallowCopy) + cs.testgroupV1, err = testgroupv1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -82,7 +82,7 @@ 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.TestgroupV1Client = testgroupv1.NewForConfigOrDie(c) + cs.testgroupV1 = testgroupv1.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -91,7 +91,7 @@ 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.TestgroupV1Client = testgroupv1.New(c) + cs.testgroupV1 = testgroupv1.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/clientset.go b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/clientset.go index e0f4eda4fd7..5d8f8ac492e 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/clientset.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/clientset.go @@ -35,18 +35,18 @@ type Interface interface { // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *metricsv1alpha1.MetricsV1alpha1Client + metricsV1alpha1 *metricsv1alpha1.MetricsV1alpha1Client } // MetricsV1alpha1 retrieves the MetricsV1alpha1Client func (c *Clientset) MetricsV1alpha1() metricsv1alpha1.MetricsV1alpha1Interface { - return c.MetricsV1alpha1Client + return c.metricsV1alpha1 } // Deprecated: Metrics retrieves the default version of MetricsClient. // Please explicitly pick a version. func (c *Clientset) Metrics() metricsv1alpha1.MetricsV1alpha1Interface { - return c.MetricsV1alpha1Client + return c.metricsV1alpha1 } // Discovery retrieves the DiscoveryClient @@ -65,7 +65,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.MetricsV1alpha1Client, err = metricsv1alpha1.NewForConfig(&configShallowCopy) + cs.metricsV1alpha1, err = metricsv1alpha1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -82,7 +82,7 @@ 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.MetricsV1alpha1Client = metricsv1alpha1.NewForConfigOrDie(c) + cs.metricsV1alpha1 = metricsv1alpha1.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -91,7 +91,7 @@ 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.MetricsV1alpha1Client = metricsv1alpha1.New(c) + cs.metricsV1alpha1 = metricsv1alpha1.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset_generated/clientset/clientset.go b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset_generated/clientset/clientset.go index bcafdadaedf..1d5a42d894b 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset_generated/clientset/clientset.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset_generated/clientset/clientset.go @@ -35,18 +35,18 @@ type Interface interface { // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *wardlev1alpha1.WardleV1alpha1Client + wardleV1alpha1 *wardlev1alpha1.WardleV1alpha1Client } // WardleV1alpha1 retrieves the WardleV1alpha1Client func (c *Clientset) WardleV1alpha1() wardlev1alpha1.WardleV1alpha1Interface { - return c.WardleV1alpha1Client + return c.wardleV1alpha1 } // Deprecated: Wardle retrieves the default version of WardleClient. // Please explicitly pick a version. func (c *Clientset) Wardle() wardlev1alpha1.WardleV1alpha1Interface { - return c.WardleV1alpha1Client + return c.wardleV1alpha1 } // Discovery retrieves the DiscoveryClient @@ -65,7 +65,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.WardleV1alpha1Client, err = wardlev1alpha1.NewForConfig(&configShallowCopy) + cs.wardleV1alpha1, err = wardlev1alpha1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -82,7 +82,7 @@ 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.WardleV1alpha1Client = wardlev1alpha1.NewForConfigOrDie(c) + cs.wardleV1alpha1 = wardlev1alpha1.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -91,7 +91,7 @@ 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.WardleV1alpha1Client = wardlev1alpha1.New(c) + cs.wardleV1alpha1 = wardlev1alpha1.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset_generated/internalclientset/clientset.go b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset_generated/internalclientset/clientset.go index b96b1664467..52122a75a8f 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset_generated/internalclientset/clientset.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset_generated/internalclientset/clientset.go @@ -33,12 +33,12 @@ type Interface interface { // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *wardleinternalversion.WardleClient + wardle *wardleinternalversion.WardleClient } // Wardle retrieves the WardleClient func (c *Clientset) Wardle() wardleinternalversion.WardleInterface { - return c.WardleClient + return c.wardle } // Discovery retrieves the DiscoveryClient @@ -57,7 +57,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.WardleClient, err = wardleinternalversion.NewForConfig(&configShallowCopy) + cs.wardle, err = wardleinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -74,7 +74,7 @@ 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.WardleClient = wardleinternalversion.NewForConfigOrDie(c) + cs.wardle = wardleinternalversion.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -83,7 +83,7 @@ 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.WardleClient = wardleinternalversion.New(c) + cs.wardle = wardleinternalversion.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs