Skip to content

K
k3s
Unverified Commit 5fcaff41 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #56136 from CaoShuFeng/storageclass

Automatic merge from submit-queue (batch tested with PRs 55545, 55548, 55815, 56136, 56185). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix storageclass unit tests Before this change, a unit test fails: ``` make test WHAT=k8s.io/kubernetes/pkg/registry/storage/storageclass/storage ``` **Release note**: ```release-note NONE ``` /assign @saad-ali /assign @thockin
parents 7dd41577 f5995e77
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
hack/lib/init.sh
View file @ 5fcaff41
...@@ -77,9 +77,9 @@ rbac.authorization.k8s.io/v1beta1 \ ...@@ -77,9 +77,9 @@ rbac.authorization.k8s.io/v1beta1 \
rbac.authorization.k8s.io/v1alpha1 \ rbac.authorization.k8s.io/v1alpha1 \
scheduling.k8s.io/v1alpha1 \ scheduling.k8s.io/v1alpha1 \
settings.k8s.io/v1alpha1 \ settings.k8s.io/v1alpha1 \
storage.k8s.io/v1alpha1 \
storage.k8s.io/v1beta1 \ storage.k8s.io/v1beta1 \
storage.k8s.io/v1 \ storage.k8s.io/v1 \
storage.k8s.io/v1alpha1 \
}" }"
# not all group versions are exposed by the server. This list contains those # not all group versions are exposed by the server. This list contains those
......
staging/src/k8s.io/client-go/kubernetes/clientset.go
View file @ 5fcaff41
...@@ -104,11 +104,11 @@ type Interface interface { ...@@ -104,11 +104,11 @@ type Interface interface {
SettingsV1alpha1() settingsv1alpha1.SettingsV1alpha1Interface SettingsV1alpha1() settingsv1alpha1.SettingsV1alpha1Interface
// Deprecated: please explicitly pick a version if possible. // Deprecated: please explicitly pick a version if possible.
Settings() settingsv1alpha1.SettingsV1alpha1Interface Settings() settingsv1alpha1.SettingsV1alpha1Interface
StorageV1alpha1() storagev1alpha1.StorageV1alpha1Interface
StorageV1beta1() storagev1beta1.StorageV1beta1Interface StorageV1beta1() storagev1beta1.StorageV1beta1Interface
StorageV1() storagev1.StorageV1Interface StorageV1() storagev1.StorageV1Interface
// Deprecated: please explicitly pick a version if possible. // Deprecated: please explicitly pick a version if possible.
Storage() storagev1.StorageV1Interface Storage() storagev1.StorageV1Interface
StorageV1alpha1() storagev1alpha1.StorageV1alpha1Interface
} }
// Clientset contains the clients for groups. Each group has exactly one // Clientset contains the clients for groups. Each group has exactly one
...@@ -139,9 +139,9 @@ type Clientset struct { ...@@ -139,9 +139,9 @@ type Clientset struct {
rbacV1alpha1 *rbacv1alpha1.RbacV1alpha1Client rbacV1alpha1 *rbacv1alpha1.RbacV1alpha1Client
schedulingV1alpha1 *schedulingv1alpha1.SchedulingV1alpha1Client schedulingV1alpha1 *schedulingv1alpha1.SchedulingV1alpha1Client
settingsV1alpha1 *settingsv1alpha1.SettingsV1alpha1Client settingsV1alpha1 *settingsv1alpha1.SettingsV1alpha1Client
storageV1alpha1 *storagev1alpha1.StorageV1alpha1Client
storageV1beta1 *storagev1beta1.StorageV1beta1Client storageV1beta1 *storagev1beta1.StorageV1beta1Client
storageV1 *storagev1.StorageV1Client storageV1 *storagev1.StorageV1Client
storageV1alpha1 *storagev1alpha1.StorageV1alpha1Client
} }
// AdmissionregistrationV1alpha1 retrieves the AdmissionregistrationV1alpha1Client // AdmissionregistrationV1alpha1 retrieves the AdmissionregistrationV1alpha1Client
...@@ -348,11 +348,6 @@ func (c *Clientset) Settings() settingsv1alpha1.SettingsV1alpha1Interface { ...@@ -348,11 +348,6 @@ func (c *Clientset) Settings() settingsv1alpha1.SettingsV1alpha1Interface {
return c.settingsV1alpha1 return c.settingsV1alpha1
} }
// StorageV1alpha1 retrieves the StorageV1alpha1Client
func (c *Clientset) StorageV1alpha1() storagev1alpha1.StorageV1alpha1Interface {
return c.storageV1alpha1
}
// StorageV1beta1 retrieves the StorageV1beta1Client // StorageV1beta1 retrieves the StorageV1beta1Client
func (c *Clientset) StorageV1beta1() storagev1beta1.StorageV1beta1Interface { func (c *Clientset) StorageV1beta1() storagev1beta1.StorageV1beta1Interface {
return c.storageV1beta1 return c.storageV1beta1
...@@ -369,6 +364,11 @@ func (c *Clientset) Storage() storagev1.StorageV1Interface { ...@@ -369,6 +364,11 @@ func (c *Clientset) Storage() storagev1.StorageV1Interface {
return c.storageV1 return c.storageV1
} }
// StorageV1alpha1 retrieves the StorageV1alpha1Client
func (c *Clientset) StorageV1alpha1() storagev1alpha1.StorageV1alpha1Interface {
return c.storageV1alpha1
}
// Discovery retrieves the DiscoveryClient // Discovery retrieves the DiscoveryClient
func (c *Clientset) Discovery() discovery.DiscoveryInterface { func (c *Clientset) Discovery() discovery.DiscoveryInterface {
if c == nil { if c == nil {
...@@ -481,15 +481,15 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { ...@@ -481,15 +481,15 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
cs.storageV1alpha1, err = storagev1alpha1.NewForConfig(&configShallowCopy) cs.storageV1beta1, err = storagev1beta1.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return nil, err return nil, err
} }
cs.storageV1beta1, err = storagev1beta1.NewForConfig(&configShallowCopy) cs.storageV1, err = storagev1.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return nil, err return nil, err
} }
cs.storageV1, err = storagev1.NewForConfig(&configShallowCopy) cs.storageV1alpha1, err = storagev1alpha1.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -530,9 +530,9 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { ...@@ -530,9 +530,9 @@ func NewForConfigOrDie(c *rest.Config) *Clientset {
cs.rbacV1alpha1 = rbacv1alpha1.NewForConfigOrDie(c) cs.rbacV1alpha1 = rbacv1alpha1.NewForConfigOrDie(c)
cs.schedulingV1alpha1 = schedulingv1alpha1.NewForConfigOrDie(c) cs.schedulingV1alpha1 = schedulingv1alpha1.NewForConfigOrDie(c)
cs.settingsV1alpha1 = settingsv1alpha1.NewForConfigOrDie(c) cs.settingsV1alpha1 = settingsv1alpha1.NewForConfigOrDie(c)
cs.storageV1alpha1 = storagev1alpha1.NewForConfigOrDie(c)
cs.storageV1beta1 = storagev1beta1.NewForConfigOrDie(c) cs.storageV1beta1 = storagev1beta1.NewForConfigOrDie(c)
cs.storageV1 = storagev1.NewForConfigOrDie(c) cs.storageV1 = storagev1.NewForConfigOrDie(c)
cs.storageV1alpha1 = storagev1alpha1.NewForConfigOrDie(c)
cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c)
return &cs return &cs
...@@ -565,9 +565,9 @@ func New(c rest.Interface) *Clientset { ...@@ -565,9 +565,9 @@ func New(c rest.Interface) *Clientset {
cs.rbacV1alpha1 = rbacv1alpha1.New(c) cs.rbacV1alpha1 = rbacv1alpha1.New(c)
cs.schedulingV1alpha1 = schedulingv1alpha1.New(c) cs.schedulingV1alpha1 = schedulingv1alpha1.New(c)
cs.settingsV1alpha1 = settingsv1alpha1.New(c) cs.settingsV1alpha1 = settingsv1alpha1.New(c)
cs.storageV1alpha1 = storagev1alpha1.New(c)
cs.storageV1beta1 = storagev1beta1.New(c) cs.storageV1beta1 = storagev1beta1.New(c)
cs.storageV1 = storagev1.New(c) cs.storageV1 = storagev1.New(c)
cs.storageV1alpha1 = storagev1alpha1.New(c)
cs.DiscoveryClient = discovery.NewDiscoveryClient(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c)
return &cs return &cs
......
staging/src/k8s.io/client-go/kubernetes/fake/clientset_generated.go
View file @ 5fcaff41
...@@ -302,11 +302,6 @@ func (c *Clientset) Settings() settingsv1alpha1.SettingsV1alpha1Interface { ...@@ -302,11 +302,6 @@ func (c *Clientset) Settings() settingsv1alpha1.SettingsV1alpha1Interface {
return &fakesettingsv1alpha1.FakeSettingsV1alpha1{Fake: &c.Fake} 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 // StorageV1beta1 retrieves the StorageV1beta1Client
func (c *Clientset) StorageV1beta1() storagev1beta1.StorageV1beta1Interface { func (c *Clientset) StorageV1beta1() storagev1beta1.StorageV1beta1Interface {
return &fakestoragev1beta1.FakeStorageV1beta1{Fake: &c.Fake} return &fakestoragev1beta1.FakeStorageV1beta1{Fake: &c.Fake}
...@@ -321,3 +316,8 @@ func (c *Clientset) StorageV1() storagev1.StorageV1Interface { ...@@ -321,3 +316,8 @@ func (c *Clientset) StorageV1() storagev1.StorageV1Interface {
func (c *Clientset) Storage() storagev1.StorageV1Interface { func (c *Clientset) Storage() storagev1.StorageV1Interface {
return &fakestoragev1.FakeStorageV1{Fake: &c.Fake} return &fakestoragev1.FakeStorageV1{Fake: &c.Fake}
} }
// StorageV1alpha1 retrieves the StorageV1alpha1Client
func (c *Clientset) StorageV1alpha1() storagev1alpha1.StorageV1alpha1Interface {
return &fakestoragev1alpha1.FakeStorageV1alpha1{Fake: &c.Fake}
}
staging/src/k8s.io/client-go/kubernetes/fake/register.go
View file @ 5fcaff41
...@@ -98,8 +98,8 @@ func AddToScheme(scheme *runtime.Scheme) { ...@@ -98,8 +98,8 @@ func AddToScheme(scheme *runtime.Scheme) {
rbacv1alpha1.AddToScheme(scheme) rbacv1alpha1.AddToScheme(scheme)
schedulingv1alpha1.AddToScheme(scheme) schedulingv1alpha1.AddToScheme(scheme)
settingsv1alpha1.AddToScheme(scheme) settingsv1alpha1.AddToScheme(scheme)
storagev1alpha1.AddToScheme(scheme)
storagev1beta1.AddToScheme(scheme) storagev1beta1.AddToScheme(scheme)
storagev1.AddToScheme(scheme) storagev1.AddToScheme(scheme)
storagev1alpha1.AddToScheme(scheme)
} }
staging/src/k8s.io/client-go/kubernetes/scheme/register.go
View file @ 5fcaff41
...@@ -98,8 +98,8 @@ func AddToScheme(scheme *runtime.Scheme) { ...@@ -98,8 +98,8 @@ func AddToScheme(scheme *runtime.Scheme) {
rbacv1alpha1.AddToScheme(scheme) rbacv1alpha1.AddToScheme(scheme)
schedulingv1alpha1.AddToScheme(scheme) schedulingv1alpha1.AddToScheme(scheme)
settingsv1alpha1.AddToScheme(scheme) settingsv1alpha1.AddToScheme(scheme)
storagev1alpha1.AddToScheme(scheme)
storagev1beta1.AddToScheme(scheme) storagev1beta1.AddToScheme(scheme)
storagev1.AddToScheme(scheme) storagev1.AddToScheme(scheme)
storagev1alpha1.AddToScheme(scheme)
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment