Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
f5995e77
Commit
f5995e77
authored
Nov 21, 2017
by
Cao Shufeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix storageclass unit tests
Before this change, a unit test fails: ``` make test WHAT=k8s.io/kubernetes/pkg/registry/storage/storageclass/storage ```
parent
849d7f85
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
20 deletions
+20
-20
init.sh
hack/lib/init.sh
+1
-1
clientset.go
staging/src/k8s.io/client-go/kubernetes/clientset.go
+12
-12
clientset_generated.go
...c/k8s.io/client-go/kubernetes/fake/clientset_generated.go
+5
-5
register.go
staging/src/k8s.io/client-go/kubernetes/fake/register.go
+1
-1
register.go
staging/src/k8s.io/client-go/kubernetes/scheme/register.go
+1
-1
No files found.
hack/lib/init.sh
View file @
f5995e77
...
@@ -76,9 +76,9 @@ rbac.authorization.k8s.io/v1beta1 \
...
@@ -76,9 +76,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 @
f5995e77
...
@@ -102,11 +102,11 @@ type Interface interface {
...
@@ -102,11 +102,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
...
@@ -136,9 +136,9 @@ type Clientset struct {
...
@@ -136,9 +136,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
...
@@ -340,11 +340,6 @@ func (c *Clientset) Settings() settingsv1alpha1.SettingsV1alpha1Interface {
...
@@ -340,11 +340,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
...
@@ -361,6 +356,11 @@ func (c *Clientset) Storage() storagev1.StorageV1Interface {
...
@@ -361,6 +356,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
{
...
@@ -469,15 +469,15 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
...
@@ -469,15 +469,15 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
cs
.
storageV1
alpha1
,
err
=
storagev1alph
a1
.
NewForConfig
(
&
configShallowCopy
)
cs
.
storageV1
beta1
,
err
=
storagev1bet
a1
.
NewForConfig
(
&
configShallowCopy
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
cs
.
storageV1
beta1
,
err
=
storagev1beta
1
.
NewForConfig
(
&
configShallowCopy
)
cs
.
storageV1
,
err
=
storagev
1
.
NewForConfig
(
&
configShallowCopy
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
cs
.
storageV1
,
err
=
storagev
1
.
NewForConfig
(
&
configShallowCopy
)
cs
.
storageV1
alpha1
,
err
=
storagev1alpha
1
.
NewForConfig
(
&
configShallowCopy
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
...
@@ -517,9 +517,9 @@ func NewForConfigOrDie(c *rest.Config) *Clientset {
...
@@ -517,9 +517,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
...
@@ -551,9 +551,9 @@ func New(c rest.Interface) *Clientset {
...
@@ -551,9 +551,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 @
f5995e77
...
@@ -295,11 +295,6 @@ func (c *Clientset) Settings() settingsv1alpha1.SettingsV1alpha1Interface {
...
@@ -295,11 +295,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
}
...
@@ -314,3 +309,8 @@ func (c *Clientset) StorageV1() storagev1.StorageV1Interface {
...
@@ -314,3 +309,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 @
f5995e77
...
@@ -96,8 +96,8 @@ func AddToScheme(scheme *runtime.Scheme) {
...
@@ -96,8 +96,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 @
f5995e77
...
@@ -96,8 +96,8 @@ func AddToScheme(scheme *runtime.Scheme) {
...
@@ -96,8 +96,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
)
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment