minor integration test fixes and more singular resource

kubernetes · Nov 18, 2022 · 1f54f61 · 1f54f61
1 parent 23e2899
commit 1f54f61
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 26 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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