From 1cc00c00247ccaf12c61ea811971d75c7751b9c9 Mon Sep 17 00:00:00 2001 From: Cao Shufeng Date: Tue, 21 Nov 2017 14:51:43 +0800 Subject: [PATCH] fix storageclass unit tests Before this change, a unit test fails: ``` make test WHAT=k8s.io/kubernetes/pkg/registry/storage/storageclass/storage ``` Kubernetes-commit: f5995e77f4d3f08c3277accc1231e6140add702a --- kubernetes/clientset.go | 26 +++++++++++++------------- kubernetes/fake/clientset_generated.go | 10 +++++----- kubernetes/fake/register.go | 2 +- kubernetes/scheme/register.go | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/kubernetes/clientset.go b/kubernetes/clientset.go index cb3f21ad..9166eb8e 100644 --- a/kubernetes/clientset.go +++ b/kubernetes/clientset.go @@ -104,11 +104,11 @@ type Interface interface { SettingsV1alpha1() settingsv1alpha1.SettingsV1alpha1Interface // Deprecated: please explicitly pick a version if possible. Settings() settingsv1alpha1.SettingsV1alpha1Interface - StorageV1alpha1() storagev1alpha1.StorageV1alpha1Interface StorageV1beta1() storagev1beta1.StorageV1beta1Interface StorageV1() storagev1.StorageV1Interface // Deprecated: please explicitly pick a version if possible. Storage() storagev1.StorageV1Interface + StorageV1alpha1() storagev1alpha1.StorageV1alpha1Interface } // Clientset contains the clients for groups. Each group has exactly one @@ -139,9 +139,9 @@ type Clientset struct { rbacV1alpha1 *rbacv1alpha1.RbacV1alpha1Client schedulingV1alpha1 *schedulingv1alpha1.SchedulingV1alpha1Client settingsV1alpha1 *settingsv1alpha1.SettingsV1alpha1Client - storageV1alpha1 *storagev1alpha1.StorageV1alpha1Client storageV1beta1 *storagev1beta1.StorageV1beta1Client storageV1 *storagev1.StorageV1Client + storageV1alpha1 *storagev1alpha1.StorageV1alpha1Client } // AdmissionregistrationV1alpha1 retrieves the AdmissionregistrationV1alpha1Client @@ -348,11 +348,6 @@ func (c *Clientset) Settings() settingsv1alpha1.SettingsV1alpha1Interface { return c.settingsV1alpha1 } -// StorageV1alpha1 retrieves the StorageV1alpha1Client -func (c *Clientset) StorageV1alpha1() storagev1alpha1.StorageV1alpha1Interface { - return c.storageV1alpha1 -} - // StorageV1beta1 retrieves the StorageV1beta1Client func (c *Clientset) StorageV1beta1() storagev1beta1.StorageV1beta1Interface { return c.storageV1beta1 @@ -369,6 +364,11 @@ func (c *Clientset) Storage() storagev1.StorageV1Interface { return c.storageV1 } +// StorageV1alpha1 retrieves the StorageV1alpha1Client +func (c *Clientset) StorageV1alpha1() storagev1alpha1.StorageV1alpha1Interface { + return c.storageV1alpha1 +} + // Discovery retrieves the DiscoveryClient func (c *Clientset) Discovery() discovery.DiscoveryInterface { if c == nil { @@ -481,10 +481,6 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { if err != nil { return nil, err } - cs.storageV1alpha1, err = storagev1alpha1.NewForConfig(&configShallowCopy) - if err != nil { - return nil, err - } cs.storageV1beta1, err = storagev1beta1.NewForConfig(&configShallowCopy) if err != nil { return nil, err @@ -493,6 +489,10 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { if err != nil { return nil, err } + cs.storageV1alpha1, err = storagev1alpha1.NewForConfig(&configShallowCopy) + if err != nil { + return nil, err + } cs.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy) if err != nil { @@ -530,9 +530,9 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { cs.rbacV1alpha1 = rbacv1alpha1.NewForConfigOrDie(c) cs.schedulingV1alpha1 = schedulingv1alpha1.NewForConfigOrDie(c) cs.settingsV1alpha1 = settingsv1alpha1.NewForConfigOrDie(c) - cs.storageV1alpha1 = storagev1alpha1.NewForConfigOrDie(c) cs.storageV1beta1 = storagev1beta1.NewForConfigOrDie(c) cs.storageV1 = storagev1.NewForConfigOrDie(c) + cs.storageV1alpha1 = storagev1alpha1.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -565,9 +565,9 @@ func New(c rest.Interface) *Clientset { cs.rbacV1alpha1 = rbacv1alpha1.New(c) cs.schedulingV1alpha1 = schedulingv1alpha1.New(c) cs.settingsV1alpha1 = settingsv1alpha1.New(c) - cs.storageV1alpha1 = storagev1alpha1.New(c) cs.storageV1beta1 = storagev1beta1.New(c) cs.storageV1 = storagev1.New(c) + cs.storageV1alpha1 = storagev1alpha1.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/kubernetes/fake/clientset_generated.go b/kubernetes/fake/clientset_generated.go index 953ad28a..bee377a1 100644 --- a/kubernetes/fake/clientset_generated.go +++ b/kubernetes/fake/clientset_generated.go @@ -302,11 +302,6 @@ func (c *Clientset) Settings() settingsv1alpha1.SettingsV1alpha1Interface { return &fakesettingsv1alpha1.FakeSettingsV1alpha1{Fake: &c.Fake} } -// StorageV1alpha1 retrieves the StorageV1alpha1Client -func (c *Clientset) StorageV1alpha1() storagev1alpha1.StorageV1alpha1Interface { - return &fakestoragev1alpha1.FakeStorageV1alpha1{Fake: &c.Fake} -} - // StorageV1beta1 retrieves the StorageV1beta1Client func (c *Clientset) StorageV1beta1() storagev1beta1.StorageV1beta1Interface { return &fakestoragev1beta1.FakeStorageV1beta1{Fake: &c.Fake} @@ -321,3 +316,8 @@ func (c *Clientset) StorageV1() storagev1.StorageV1Interface { func (c *Clientset) Storage() storagev1.StorageV1Interface { return &fakestoragev1.FakeStorageV1{Fake: &c.Fake} } + +// StorageV1alpha1 retrieves the StorageV1alpha1Client +func (c *Clientset) StorageV1alpha1() storagev1alpha1.StorageV1alpha1Interface { + return &fakestoragev1alpha1.FakeStorageV1alpha1{Fake: &c.Fake} +} diff --git a/kubernetes/fake/register.go b/kubernetes/fake/register.go index 2748fe0f..eaba2029 100644 --- a/kubernetes/fake/register.go +++ b/kubernetes/fake/register.go @@ -98,8 +98,8 @@ func AddToScheme(scheme *runtime.Scheme) { rbacv1alpha1.AddToScheme(scheme) schedulingv1alpha1.AddToScheme(scheme) settingsv1alpha1.AddToScheme(scheme) - storagev1alpha1.AddToScheme(scheme) storagev1beta1.AddToScheme(scheme) storagev1.AddToScheme(scheme) + storagev1alpha1.AddToScheme(scheme) } diff --git a/kubernetes/scheme/register.go b/kubernetes/scheme/register.go index 56e21a56..d8d5585f 100644 --- a/kubernetes/scheme/register.go +++ b/kubernetes/scheme/register.go @@ -98,8 +98,8 @@ func AddToScheme(scheme *runtime.Scheme) { rbacv1alpha1.AddToScheme(scheme) schedulingv1alpha1.AddToScheme(scheme) settingsv1alpha1.AddToScheme(scheme) - storagev1alpha1.AddToScheme(scheme) storagev1beta1.AddToScheme(scheme) storagev1.AddToScheme(scheme) + storagev1alpha1.AddToScheme(scheme) }