From 1f54f610e46b1db390fc7d2a76d1716c842fd51d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arda=20G=C3=BC=C3=A7l=C3=BC?= Date: Fri, 18 Nov 2022 13:11:16 +0300 Subject: [PATCH] minor integration test fixes and more singular resource --- .../validatingadmissionpolicy/storage/storage.go | 3 ++- .../validatingadmissionpolicybinding/storage/storage.go | 3 ++- pkg/registry/authentication/selfsubjectreview/rest.go | 2 ++ pkg/registry/rbac/clusterrole/policybased/storage.go | 4 ++-- .../rbac/clusterrolebinding/policybased/storage.go | 4 ++-- pkg/registry/rbac/role/policybased/storage.go | 4 ++-- pkg/registry/rbac/rolebinding/policybased/storage.go | 4 ++-- pkg/registry/resource/podscheduling/storage/storage.go | 9 +++++---- pkg/registry/resource/resourceclaim/storage/storage.go | 9 +++++---- .../resource/resourceclaimtemplate/storage/storage.go | 7 ++++--- pkg/registry/resource/resourceclass/storage/storage.go | 7 ++++--- test/cmd/discovery.sh | 4 ++-- 12 files changed, 34 insertions(+), 26 deletions(-) diff --git a/pkg/registry/admissionregistration/validatingadmissionpolicy/storage/storage.go b/pkg/registry/admissionregistration/validatingadmissionpolicy/storage/storage.go index 2c2f765e740..dfdf9339a17 100644 --- a/pkg/registry/admissionregistration/validatingadmissionpolicy/storage/storage.go +++ b/pkg/registry/admissionregistration/validatingadmissionpolicy/storage/storage.go @@ -47,7 +47,8 @@ func NewREST(optsGetter generic.RESTOptionsGetter, authorizer authorizer.Authori ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*admissionregistration.ValidatingAdmissionPolicy).Name, nil }, - DefaultQualifiedResource: groupResource, + DefaultQualifiedResource: groupResource, + SingularQualifiedResource: admissionregistration.Resource("validatingadmissionpolicy"), CreateStrategy: strategy, UpdateStrategy: strategy, diff --git a/pkg/registry/admissionregistration/validatingadmissionpolicybinding/storage/storage.go b/pkg/registry/admissionregistration/validatingadmissionpolicybinding/storage/storage.go index 0f0afa4b39b..8d8b9ee9ffb 100644 --- a/pkg/registry/admissionregistration/validatingadmissionpolicybinding/storage/storage.go +++ b/pkg/registry/admissionregistration/validatingadmissionpolicybinding/storage/storage.go @@ -50,7 +50,8 @@ func NewREST(optsGetter generic.RESTOptionsGetter, authorizer authorizer.Authori ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*admissionregistration.ValidatingAdmissionPolicyBinding).Name, nil }, - DefaultQualifiedResource: groupResource, + DefaultQualifiedResource: groupResource, + SingularQualifiedResource: admissionregistration.Resource("validatingadmissionpolicybinding"), CreateStrategy: strategy, UpdateStrategy: strategy, diff --git a/pkg/registry/authentication/selfsubjectreview/rest.go b/pkg/registry/authentication/selfsubjectreview/rest.go index 06af5b039e8..9c1978104c0 100644 --- a/pkg/registry/authentication/selfsubjectreview/rest.go +++ b/pkg/registry/authentication/selfsubjectreview/rest.go @@ -94,6 +94,8 @@ func (r *REST) Create(ctx context.Context, obj runtime.Object, createValidation return selfSAR, nil } +var _ rest.SingularNameProvider = &REST{} + func (r *REST) GetSingularName() string { return "selfsubjectrulesreview" } diff --git a/pkg/registry/rbac/clusterrole/policybased/storage.go b/pkg/registry/rbac/clusterrole/policybased/storage.go index 1e113cd9e07..260f75eb02f 100644 --- a/pkg/registry/rbac/clusterrole/policybased/storage.go +++ b/pkg/registry/rbac/clusterrole/policybased/storage.go @@ -128,9 +128,9 @@ func hasAggregationRule(clusterRole *rbac.ClusterRole) bool { var _ rest.SingularNameProvider = &Storage{} func (s *Storage) GetSingularName() string { - svp, ok := s.StandardStorage.(rest.SingularNameProvider) + snp, ok := s.StandardStorage.(rest.SingularNameProvider) if !ok { return "" } - return svp.GetSingularName() + return snp.GetSingularName() } diff --git a/pkg/registry/rbac/clusterrolebinding/policybased/storage.go b/pkg/registry/rbac/clusterrolebinding/policybased/storage.go index 1c3cd3431f3..3e4b9d725f5 100644 --- a/pkg/registry/rbac/clusterrolebinding/policybased/storage.go +++ b/pkg/registry/rbac/clusterrolebinding/policybased/storage.go @@ -131,9 +131,9 @@ func (s *Storage) Update(ctx context.Context, name string, obj rest.UpdatedObjec var _ rest.SingularNameProvider = &Storage{} func (s *Storage) GetSingularName() string { - svp, ok := s.StandardStorage.(rest.SingularNameProvider) + snp, ok := s.StandardStorage.(rest.SingularNameProvider) if !ok { return "" } - return svp.GetSingularName() + return snp.GetSingularName() } diff --git a/pkg/registry/rbac/role/policybased/storage.go b/pkg/registry/rbac/role/policybased/storage.go index 36ac26dd3e9..83f49e02dec 100644 --- a/pkg/registry/rbac/role/policybased/storage.go +++ b/pkg/registry/rbac/role/policybased/storage.go @@ -103,9 +103,9 @@ func (s *Storage) Update(ctx context.Context, name string, obj rest.UpdatedObjec var _ rest.SingularNameProvider = &Storage{} func (s *Storage) GetSingularName() string { - svp, ok := s.StandardStorage.(rest.SingularNameProvider) + snp, ok := s.StandardStorage.(rest.SingularNameProvider) if !ok { return "" } - return svp.GetSingularName() + return snp.GetSingularName() } diff --git a/pkg/registry/rbac/rolebinding/policybased/storage.go b/pkg/registry/rbac/rolebinding/policybased/storage.go index 10e1a656201..21171ec4022 100644 --- a/pkg/registry/rbac/rolebinding/policybased/storage.go +++ b/pkg/registry/rbac/rolebinding/policybased/storage.go @@ -146,9 +146,9 @@ func (s *Storage) Update(ctx context.Context, name string, obj rest.UpdatedObjec var _ rest.SingularNameProvider = &Storage{} func (s *Storage) GetSingularName() string { - svp, ok := s.StandardStorage.(rest.SingularNameProvider) + snp, ok := s.StandardStorage.(rest.SingularNameProvider) if !ok { return "" } - return svp.GetSingularName() + return snp.GetSingularName() } diff --git a/pkg/registry/resource/podscheduling/storage/storage.go b/pkg/registry/resource/podscheduling/storage/storage.go index b977f283b85..5c066d2860e 100644 --- a/pkg/registry/resource/podscheduling/storage/storage.go +++ b/pkg/registry/resource/podscheduling/storage/storage.go @@ -40,10 +40,11 @@ type REST struct { // NewREST returns a RESTStorage object that will work against PodSchedulings. func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST, error) { store := &genericregistry.Store{ - NewFunc: func() runtime.Object { return &resource.PodScheduling{} }, - NewListFunc: func() runtime.Object { return &resource.PodSchedulingList{} }, - PredicateFunc: podscheduling.Match, - DefaultQualifiedResource: resource.Resource("podschedulings"), + NewFunc: func() runtime.Object { return &resource.PodScheduling{} }, + NewListFunc: func() runtime.Object { return &resource.PodSchedulingList{} }, + PredicateFunc: podscheduling.Match, + DefaultQualifiedResource: resource.Resource("podschedulings"), + SingularQualifiedResource: resource.Resource("podscheduling"), CreateStrategy: podscheduling.Strategy, UpdateStrategy: podscheduling.Strategy, diff --git a/pkg/registry/resource/resourceclaim/storage/storage.go b/pkg/registry/resource/resourceclaim/storage/storage.go index 959cb680bfe..5784c6e309c 100644 --- a/pkg/registry/resource/resourceclaim/storage/storage.go +++ b/pkg/registry/resource/resourceclaim/storage/storage.go @@ -40,10 +40,11 @@ type REST struct { // NewREST returns a RESTStorage object that will work against ResourceClaims. func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST, error) { store := &genericregistry.Store{ - NewFunc: func() runtime.Object { return &resource.ResourceClaim{} }, - NewListFunc: func() runtime.Object { return &resource.ResourceClaimList{} }, - PredicateFunc: resourceclaim.Match, - DefaultQualifiedResource: resource.Resource("resourceclaims"), + NewFunc: func() runtime.Object { return &resource.ResourceClaim{} }, + NewListFunc: func() runtime.Object { return &resource.ResourceClaimList{} }, + PredicateFunc: resourceclaim.Match, + DefaultQualifiedResource: resource.Resource("resourceclaims"), + SingularQualifiedResource: resource.Resource("resourceclaim"), CreateStrategy: resourceclaim.Strategy, UpdateStrategy: resourceclaim.Strategy, diff --git a/pkg/registry/resource/resourceclaimtemplate/storage/storage.go b/pkg/registry/resource/resourceclaimtemplate/storage/storage.go index 282db91006d..f32851f9550 100644 --- a/pkg/registry/resource/resourceclaimtemplate/storage/storage.go +++ b/pkg/registry/resource/resourceclaimtemplate/storage/storage.go @@ -35,9 +35,10 @@ type REST struct { // NewREST returns a RESTStorage object that will work against ResourceClass. func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, error) { store := &genericregistry.Store{ - NewFunc: func() runtime.Object { return &resource.ResourceClaimTemplate{} }, - NewListFunc: func() runtime.Object { return &resource.ResourceClaimTemplateList{} }, - DefaultQualifiedResource: resource.Resource("resourceclaimtemplates"), + NewFunc: func() runtime.Object { return &resource.ResourceClaimTemplate{} }, + NewListFunc: func() runtime.Object { return &resource.ResourceClaimTemplateList{} }, + DefaultQualifiedResource: resource.Resource("resourceclaimtemplates"), + SingularQualifiedResource: resource.Resource("resourceclaimtemplate"), CreateStrategy: resourceclaimtemplate.Strategy, UpdateStrategy: resourceclaimtemplate.Strategy, diff --git a/pkg/registry/resource/resourceclass/storage/storage.go b/pkg/registry/resource/resourceclass/storage/storage.go index 310488ab04e..ad7d283b954 100644 --- a/pkg/registry/resource/resourceclass/storage/storage.go +++ b/pkg/registry/resource/resourceclass/storage/storage.go @@ -35,9 +35,10 @@ type REST struct { // NewREST returns a RESTStorage object that will work against ResourceClass. func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, error) { store := &genericregistry.Store{ - NewFunc: func() runtime.Object { return &resource.ResourceClass{} }, - NewListFunc: func() runtime.Object { return &resource.ResourceClassList{} }, - DefaultQualifiedResource: resource.Resource("resourceclasses"), + NewFunc: func() runtime.Object { return &resource.ResourceClass{} }, + NewListFunc: func() runtime.Object { return &resource.ResourceClassList{} }, + DefaultQualifiedResource: resource.Resource("resourceclasses"), + SingularQualifiedResource: resource.Resource("resourceclass"), CreateStrategy: resourceclass.Strategy, UpdateStrategy: resourceclass.Strategy, diff --git a/test/cmd/discovery.sh b/test/cmd/discovery.sh index daec7052202..4979f4356d1 100755 --- a/test/cmd/discovery.sh +++ b/test/cmd/discovery.sh @@ -91,7 +91,7 @@ spec: __EOF__ # 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__ apiVersion: test.com/v1 @@ -169,7 +169,7 @@ spec: __EOF__ # 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__ apiVersion: test.com/v1