Short names for staged policies (#10280)

Author: MichalFupso

apiserver/pkg/registry/projectcalico/rest/storage_calico.go

@@ -104,7 +104,7 @@ func (p RESTStorageProvider) NewV3Storage(
 		},
 		p.StorageType,
 		authorizer,
-		[]string{},
+		[]string{"sknp"},
 	)
 
 	stagedpolicyRESTOptions, err := restOptionsGetter.GetRESTOptions(calico.Resource("stagednetworkpolicies"), nil)
@@ -126,7 +126,7 @@ func (p RESTStorageProvider) NewV3Storage(
 		},
 		p.StorageType,
 		authorizer,
-		[]string{},
+		[]string{"snp"},
 	)
 
 	networksetRESTOptions, err := restOptionsGetter.GetRESTOptions(calico.Resource("networksets"), nil)
@@ -214,7 +214,7 @@ func (p RESTStorageProvider) NewV3Storage(
 		},
 		p.StorageType,
 		authorizer,
-		[]string{},
+		[]string{"sgnp"},
 	)
 
 	gNetworkSetRESTOptions, err := restOptionsGetter.GetRESTOptions(calico.Resource("globalnetworksets"), nil)

apiserver/pkg/registry/projectcalico/stagedglobalnetworkpolicy/storage.go

@@ -39,6 +39,7 @@ type REST struct {
 	*genericregistry.Store
 	rbac.CalicoResourceLister
 	authorizer authorizer.TierAuthorizer
+	shortNames []string
 }
 
 // EmptyObject returns an empty instance
@@ -102,7 +103,7 @@ func NewREST(scheme *runtime.Scheme, opts server.Options, calicoResourceLister r
 		DestroyFunc: dFunc,
 	}
 
-	return &REST{store, calicoResourceLister, authorizer.NewTierAuthorizer(opts.Authorizer)}, nil
+	return &REST{store, calicoResourceLister, authorizer.NewTierAuthorizer(opts.Authorizer), opts.ShortNames}, nil
 }
 
 func (r *REST) List(ctx context.Context, options *metainternalversion.ListOptions) (runtime.Object, error) {
@@ -166,3 +167,7 @@ func (r *REST) Watch(ctx context.Context, options *metainternalversion.ListOptio
 
 	return r.Store.Watch(ctx, options)
 }
+
+func (r *REST) ShortNames() []string {
+	return r.shortNames
+}

apiserver/pkg/registry/projectcalico/stagedkubernetesnetworkpolicy/storage.go

@@ -30,6 +30,7 @@ import (
 // rest implements a RESTStorage for API services against etcd
 type REST struct {
 	*genericregistry.Store
+	shortNames []string
 }
 
 // EmptyObject returns an empty instance
@@ -89,5 +90,9 @@ func NewREST(scheme *runtime.Scheme, opts server.Options) (*REST, error) {
 		DestroyFunc: dFunc,
 	}
 
-	return &REST{store}, nil
+	return &REST{store, opts.ShortNames}, nil
+}
+
+func (r *REST) ShortNames() []string {
+	return r.shortNames
 }

apiserver/pkg/registry/projectcalico/stagednetworkpolicy/storage.go

@@ -39,6 +39,7 @@ type REST struct {
 	*genericregistry.Store
 	rbac.CalicoResourceLister
 	authorizer authorizer.TierAuthorizer
+	shortNames []string
 }
 
 // EmptyObject returns an empty instance
@@ -98,7 +99,7 @@ func NewREST(scheme *runtime.Scheme, opts server.Options, calicoResourceLister r
 		DestroyFunc: dFunc,
 	}
 
-	return &REST{store, calicoResourceLister, authorizer.NewTierAuthorizer(opts.Authorizer)}, nil
+	return &REST{store, calicoResourceLister, authorizer.NewTierAuthorizer(opts.Authorizer), opts.ShortNames}, nil
 }
 
 func (r *REST) List(ctx context.Context, options *metainternalversion.ListOptions) (runtime.Object, error) {
@@ -162,3 +163,7 @@ func (r *REST) Watch(ctx context.Context, options *metainternalversion.ListOptio
 
 	return r.Store.Watch(ctx, options)
 }
+
+func (r *REST) ShortNames() []string {
+	return r.shortNames
+}