github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 01:40:13 +00:00
Code Issues Projects Releases Wiki Activity

minor integration test fixes and more singular resource

Browse Source
This commit is contained in:
Arda Güçlü 2022-11-18 13:11:16 +03:00
parent 23e2899556
commit 1f54f610e4
12 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/registry/admissionregistration/validatingadmissionpolicy/storage/storage.go
View File

@ -47,7 +47,8 @@ func NewREST(optsGetter generic.RESTOptionsGetter, authorizer authorizer.Authori
ObjectNameFunc: func(obj runtime.Object) (string, error) { ObjectNameFunc: func(obj runtime.Object) (string, error) {
return obj.(*admissionregistration.ValidatingAdmissionPolicy).Name, nil return obj.(*admissionregistration.ValidatingAdmissionPolicy).Name, nil
}, },
DefaultQualifiedResource: groupResource, DefaultQualifiedResource: groupResource,
SingularQualifiedResource: admissionregistration.Resource("validatingadmissionpolicy"),
CreateStrategy: strategy, CreateStrategy: strategy,
UpdateStrategy: strategy, UpdateStrategy: strategy,

3
pkg/registry/admissionregistration/validatingadmissionpolicybinding/storage/storage.go
View File

@ -50,7 +50,8 @@ func NewREST(optsGetter generic.RESTOptionsGetter, authorizer authorizer.Authori
ObjectNameFunc: func(obj runtime.Object) (string, error) { ObjectNameFunc: func(obj runtime.Object) (string, error) {
return obj.(*admissionregistration.ValidatingAdmissionPolicyBinding).Name, nil return obj.(*admissionregistration.ValidatingAdmissionPolicyBinding).Name, nil
}, },
DefaultQualifiedResource: groupResource, DefaultQualifiedResource: groupResource,
SingularQualifiedResource: admissionregistration.Resource("validatingadmissionpolicybinding"),
CreateStrategy: strategy, CreateStrategy: strategy,
UpdateStrategy: strategy, UpdateStrategy: strategy,

2
pkg/registry/authentication/selfsubjectreview/rest.go
View File

@ -94,6 +94,8 @@ func (r *REST) Create(ctx context.Context, obj runtime.Object, createValidation
return selfSAR, nil return selfSAR, nil
} }
var _ rest.SingularNameProvider = &REST{}
func (r *REST) GetSingularName() string { func (r *REST) GetSingularName() string {
return "selfsubjectrulesreview" return "selfsubjectrulesreview"
} }

4
pkg/registry/rbac/clusterrole/policybased/storage.go
View File

@ -128,9 +128,9 @@ func hasAggregationRule(clusterRole *rbac.ClusterRole) bool {
var _ rest.SingularNameProvider = &Storage{} var _ rest.SingularNameProvider = &Storage{}
func (s *Storage) GetSingularName() string { func (s *Storage) GetSingularName() string {
svp, ok := s.StandardStorage.(rest.SingularNameProvider) snp, ok := s.StandardStorage.(rest.SingularNameProvider)
if !ok { if !ok {
return "" return ""
} }
return svp.GetSingularName() return snp.GetSingularName()
} }

4
pkg/registry/rbac/clusterrolebinding/policybased/storage.go
View File

@ -131,9 +131,9 @@ func (s *Storage) Update(ctx context.Context, name string, obj rest.UpdatedObjec
var _ rest.SingularNameProvider = &Storage{} var _ rest.SingularNameProvider = &Storage{}
func (s *Storage) GetSingularName() string { func (s *Storage) GetSingularName() string {
svp, ok := s.StandardStorage.(rest.SingularNameProvider) snp, ok := s.StandardStorage.(rest.SingularNameProvider)
if !ok { if !ok {
return "" return ""
} }
return svp.GetSingularName() return snp.GetSingularName()
} }

4
pkg/registry/rbac/role/policybased/storage.go
View File

@ -103,9 +103,9 @@ func (s *Storage) Update(ctx context.Context, name string, obj rest.UpdatedObjec
var _ rest.SingularNameProvider = &Storage{} var _ rest.SingularNameProvider = &Storage{}
func (s *Storage) GetSingularName() string { func (s *Storage) GetSingularName() string {
svp, ok := s.StandardStorage.(rest.SingularNameProvider) snp, ok := s.StandardStorage.(rest.SingularNameProvider)
if !ok { if !ok {
return "" return ""
} }
return svp.GetSingularName() return snp.GetSingularName()
} }

4
pkg/registry/rbac/rolebinding/policybased/storage.go
View File

@ -146,9 +146,9 @@ func (s *Storage) Update(ctx context.Context, name string, obj rest.UpdatedObjec
var _ rest.SingularNameProvider = &Storage{} var _ rest.SingularNameProvider = &Storage{}
func (s *Storage) GetSingularName() string { func (s *Storage) GetSingularName() string {
svp, ok := s.StandardStorage.(rest.SingularNameProvider) snp, ok := s.StandardStorage.(rest.SingularNameProvider)
if !ok { if !ok {
return "" return ""
} }
return svp.GetSingularName() return snp.GetSingularName()
} }

9
pkg/registry/resource/podscheduling/storage/storage.go
View File

@ -40,10 +40,11 @@ type REST struct {
// NewREST returns a RESTStorage object that will work against PodSchedulings. // NewREST returns a RESTStorage object that will work against PodSchedulings.
func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST, error) { func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST, error) {
store := &genericregistry.Store{ store := &genericregistry.Store{
NewFunc: func() runtime.Object { return &resource.PodScheduling{} }, NewFunc: func() runtime.Object { return &resource.PodScheduling{} },
NewListFunc: func() runtime.Object { return &resource.PodSchedulingList{} }, NewListFunc: func() runtime.Object { return &resource.PodSchedulingList{} },
PredicateFunc: podscheduling.Match, PredicateFunc: podscheduling.Match,
DefaultQualifiedResource: resource.Resource("podschedulings"), DefaultQualifiedResource: resource.Resource("podschedulings"),
SingularQualifiedResource: resource.Resource("podscheduling"),
CreateStrategy: podscheduling.Strategy, CreateStrategy: podscheduling.Strategy,
UpdateStrategy: podscheduling.Strategy, UpdateStrategy: podscheduling.Strategy,

9
pkg/registry/resource/resourceclaim/storage/storage.go
View File

@ -40,10 +40,11 @@ type REST struct {
// NewREST returns a RESTStorage object that will work against ResourceClaims. // NewREST returns a RESTStorage object that will work against ResourceClaims.
func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST, error) { func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST, error) {
store := &genericregistry.Store{ store := &genericregistry.Store{
NewFunc: func() runtime.Object { return &resource.ResourceClaim{} }, NewFunc: func() runtime.Object { return &resource.ResourceClaim{} },
NewListFunc: func() runtime.Object { return &resource.ResourceClaimList{} }, NewListFunc: func() runtime.Object { return &resource.ResourceClaimList{} },
PredicateFunc: resourceclaim.Match, PredicateFunc: resourceclaim.Match,
DefaultQualifiedResource: resource.Resource("resourceclaims"), DefaultQualifiedResource: resource.Resource("resourceclaims"),
SingularQualifiedResource: resource.Resource("resourceclaim"),
CreateStrategy: resourceclaim.Strategy, CreateStrategy: resourceclaim.Strategy,
UpdateStrategy: resourceclaim.Strategy, UpdateStrategy: resourceclaim.Strategy,

7
pkg/registry/resource/resourceclaimtemplate/storage/storage.go
View File

@ -35,9 +35,10 @@ type REST struct {
// NewREST returns a RESTStorage object that will work against ResourceClass. // NewREST returns a RESTStorage object that will work against ResourceClass.
func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, error) { func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, error) {
store := &genericregistry.Store{ store := &genericregistry.Store{
NewFunc: func() runtime.Object { return &resource.ResourceClaimTemplate{} }, NewFunc: func() runtime.Object { return &resource.ResourceClaimTemplate{} },
NewListFunc: func() runtime.Object { return &resource.ResourceClaimTemplateList{} }, NewListFunc: func() runtime.Object { return &resource.ResourceClaimTemplateList{} },
DefaultQualifiedResource: resource.Resource("resourceclaimtemplates"), DefaultQualifiedResource: resource.Resource("resourceclaimtemplates"),
SingularQualifiedResource: resource.Resource("resourceclaimtemplate"),
CreateStrategy: resourceclaimtemplate.Strategy, CreateStrategy: resourceclaimtemplate.Strategy,
UpdateStrategy: resourceclaimtemplate.Strategy, UpdateStrategy: resourceclaimtemplate.Strategy,

7
pkg/registry/resource/resourceclass/storage/storage.go
View File

@ -35,9 +35,10 @@ type REST struct {
// NewREST returns a RESTStorage object that will work against ResourceClass. // NewREST returns a RESTStorage object that will work against ResourceClass.
func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, error) { func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, error) {
store := &genericregistry.Store{ store := &genericregistry.Store{
NewFunc: func() runtime.Object { return &resource.ResourceClass{} }, NewFunc: func() runtime.Object { return &resource.ResourceClass{} },
NewListFunc: func() runtime.Object { return &resource.ResourceClassList{} }, NewListFunc: func() runtime.Object { return &resource.ResourceClassList{} },
DefaultQualifiedResource: resource.Resource("resourceclasses"), DefaultQualifiedResource: resource.Resource("resourceclasses"),
SingularQualifiedResource: resource.Resource("resourceclass"),
CreateStrategy: resourceclass.Strategy, CreateStrategy: resourceclass.Strategy,
UpdateStrategy: resourceclass.Strategy, UpdateStrategy: resourceclass.Strategy,

4
test/cmd/discovery.sh
View File

@ -91,7 +91,7 @@ spec:
__EOF__ __EOF__
# Test that we can list this new custom resource # Test that we can list this new custom resource
kube::test::wait_object_assert customresourcedefinitions "{{range.items}}{{if eq ${id_field:?} \\\"examples.test.com\\\"}}{{$id_field}}:{{end}}{{end}}" 'examples.test.com:' kube::test::wait_object_assert customresourcedefinitions "{{range.items}}{{if eq ${id_field:?} \"examples.test.com\"}}{{$id_field}}:{{end}}{{end}}" 'examples.test.com:'
kubectl create -f - << __EOF__ kubectl create -f - << __EOF__
apiVersion: test.com/v1 apiVersion: test.com/v1
@ -169,7 +169,7 @@ spec:
__EOF__ __EOF__
# Test that we can list this new custom resource # Test that we can list this new custom resource
kube::test::wait_object_assert customresourcedefinitions "{{range.items}}{{if eq ${id_field:?} \\\"examples.test.com\\\"}}{{$id_field}}:{{end}}{{end}}" 'examples.test.com:' kube::test::wait_object_assert customresourcedefinitions "{{range.items}}{{if eq ${id_field:?} \"examples.test.com\"}}{{$id_field}}:{{end}}{{end}}" 'examples.test.com:'
kubectl create -f - << __EOF__ kubectl create -f - << __EOF__
apiVersion: test.com/v1 apiVersion: test.com/v1