From ff636f25c0ada35defa2413b8e1809061394b2dc Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 13 Apr 2018 16:06:52 +0200 Subject: [PATCH] Move podsecuritypolicy registry to policy package. --- cmd/kube-apiserver/app/server.go | 3 +-- hack/test-update-storage-objects.sh | 2 +- pkg/registry/BUILD | 2 +- pkg/registry/extensions/rest/BUILD | 2 +- pkg/registry/extensions/rest/storage_extensions.go | 6 +++--- pkg/registry/{extensions => policy}/podsecuritypolicy/BUILD | 4 ++-- .../{extensions => policy}/podsecuritypolicy/doc.go | 2 +- .../{extensions => policy}/podsecuritypolicy/storage/BUILD | 5 ++--- .../podsecuritypolicy/storage/storage.go | 5 ++--- .../podsecuritypolicy/storage/storage_test.go | 0 .../{extensions => policy}/podsecuritypolicy/strategy.go | 0 pkg/registry/policy/rest/BUILD | 2 +- pkg/registry/policy/rest/storage_policy.go | 2 +- test/integration/etcd/etcd_storage_path_test.go | 2 +- test/test_owners.csv | 2 +- 15 files changed, 18 insertions(+), 21 deletions(-) rename pkg/registry/{extensions => policy}/podsecuritypolicy/BUILD (87%) rename pkg/registry/{extensions => policy}/podsecuritypolicy/doc.go (95%) rename pkg/registry/{extensions => policy}/podsecuritypolicy/storage/BUILD (88%) rename pkg/registry/{extensions => policy}/podsecuritypolicy/storage/storage.go (92%) rename pkg/registry/{extensions => policy}/podsecuritypolicy/storage/storage_test.go (100%) rename pkg/registry/{extensions => policy}/podsecuritypolicy/strategy.go (100%) diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index 92faff4156..ffec2d8fde 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -643,8 +643,7 @@ func BuildStorageFactory(s *options.ServerRunOptions, apiResourceConfig *servers storageFactory.AddCohabitatingResources(apps.Resource("daemonsets"), extensions.Resource("daemonsets")) storageFactory.AddCohabitatingResources(apps.Resource("replicasets"), extensions.Resource("replicasets")) storageFactory.AddCohabitatingResources(api.Resource("events"), events.Resource("events")) - // TODO(#54933): 1.11: switch to using policy storage and flip the order here - storageFactory.AddCohabitatingResources(extensions.Resource("podsecuritypolicies"), policy.Resource("podsecuritypolicies")) + storageFactory.AddCohabitatingResources(policy.Resource("podsecuritypolicies"), extensions.Resource("podsecuritypolicies")) for _, override := range s.Etcd.EtcdServersOverrides { tokens := strings.Split(override, "#") apiresource := strings.Split(tokens[0], "/") diff --git a/hack/test-update-storage-objects.sh b/hack/test-update-storage-objects.sh index 99fe4070d2..4b0fdedc60 100755 --- a/hack/test-update-storage-objects.sh +++ b/hack/test-update-storage-objects.sh @@ -110,7 +110,7 @@ examples/persistent-volume-provisioning/rbd/rbd-storage-class.yaml,storageclasse ) KUBE_OLD_API_VERSION="networking.k8s.io/v1,storage.k8s.io/v1beta1,extensions/v1beta1" -KUBE_NEW_API_VERSION="networking.k8s.io/v1,storage.k8s.io/v1,extensions/v1beta1" +KUBE_NEW_API_VERSION="networking.k8s.io/v1,storage.k8s.io/v1,extensions/v1beta1,policy/v1beta1" KUBE_OLD_STORAGE_VERSIONS="storage.k8s.io/v1beta1" KUBE_NEW_STORAGE_VERSIONS="storage.k8s.io/v1" diff --git a/pkg/registry/BUILD b/pkg/registry/BUILD index be61c8554a..73f892bcef 100644 --- a/pkg/registry/BUILD +++ b/pkg/registry/BUILD @@ -70,11 +70,11 @@ filegroup( "//pkg/registry/events/rest:all-srcs", "//pkg/registry/extensions/controller/storage:all-srcs", "//pkg/registry/extensions/ingress:all-srcs", - "//pkg/registry/extensions/podsecuritypolicy:all-srcs", "//pkg/registry/extensions/rest:all-srcs", "//pkg/registry/networking/networkpolicy:all-srcs", "//pkg/registry/networking/rest:all-srcs", "//pkg/registry/policy/poddisruptionbudget:all-srcs", + "//pkg/registry/policy/podsecuritypolicy:all-srcs", "//pkg/registry/policy/rest:all-srcs", "//pkg/registry/rbac:all-srcs", "//pkg/registry/registrytest:all-srcs", diff --git a/pkg/registry/extensions/rest/BUILD b/pkg/registry/extensions/rest/BUILD index 4e984a4583..a93751bbd6 100644 --- a/pkg/registry/extensions/rest/BUILD +++ b/pkg/registry/extensions/rest/BUILD @@ -17,8 +17,8 @@ go_library( "//pkg/registry/apps/replicaset/storage:go_default_library", "//pkg/registry/extensions/controller/storage:go_default_library", "//pkg/registry/extensions/ingress/storage:go_default_library", - "//pkg/registry/extensions/podsecuritypolicy/storage:go_default_library", "//pkg/registry/networking/networkpolicy/storage:go_default_library", + "//pkg/registry/policy/podsecuritypolicy/storage:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library", diff --git a/pkg/registry/extensions/rest/storage_extensions.go b/pkg/registry/extensions/rest/storage_extensions.go index b77ca23bad..09c931c161 100644 --- a/pkg/registry/extensions/rest/storage_extensions.go +++ b/pkg/registry/extensions/rest/storage_extensions.go @@ -29,8 +29,8 @@ import ( replicasetstore "k8s.io/kubernetes/pkg/registry/apps/replicaset/storage" expcontrollerstore "k8s.io/kubernetes/pkg/registry/extensions/controller/storage" ingressstore "k8s.io/kubernetes/pkg/registry/extensions/ingress/storage" - pspstore "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy/storage" networkpolicystore "k8s.io/kubernetes/pkg/registry/networking/networkpolicy/storage" + pspstore "k8s.io/kubernetes/pkg/registry/policy/podsecuritypolicy/storage" ) type RESTStorageProvider struct{} @@ -74,8 +74,8 @@ func (p RESTStorageProvider) v1beta1Storage(apiResourceConfigSource serverstorag storage["ingresses/status"] = ingressStatusStorage // podsecuritypolicy - podSecurityExtensionsStorage := pspstore.NewREST(restOptionsGetter) - storage["podSecurityPolicies"] = podSecurityExtensionsStorage + podSecurityPolicyStorage := pspstore.NewREST(restOptionsGetter) + storage["podSecurityPolicies"] = podSecurityPolicyStorage // replicasets replicaSetStorage := replicasetstore.NewStorage(restOptionsGetter) diff --git a/pkg/registry/extensions/podsecuritypolicy/BUILD b/pkg/registry/policy/podsecuritypolicy/BUILD similarity index 87% rename from pkg/registry/extensions/podsecuritypolicy/BUILD rename to pkg/registry/policy/podsecuritypolicy/BUILD index acca031038..28d528e8b2 100644 --- a/pkg/registry/extensions/podsecuritypolicy/BUILD +++ b/pkg/registry/policy/podsecuritypolicy/BUILD @@ -11,7 +11,7 @@ go_library( "doc.go", "strategy.go", ], - importpath = "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy", + importpath = "k8s.io/kubernetes/pkg/registry/policy/podsecuritypolicy", deps = [ "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/policy:go_default_library", @@ -35,7 +35,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/extensions/podsecuritypolicy/storage:all-srcs", + "//pkg/registry/policy/podsecuritypolicy/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/extensions/podsecuritypolicy/doc.go b/pkg/registry/policy/podsecuritypolicy/doc.go similarity index 95% rename from pkg/registry/extensions/podsecuritypolicy/doc.go rename to pkg/registry/policy/podsecuritypolicy/doc.go index 0768815dfa..160901d962 100644 --- a/pkg/registry/extensions/podsecuritypolicy/doc.go +++ b/pkg/registry/policy/podsecuritypolicy/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package podsecuritypolicy provides Registry interface and its REST // implementation for storing PodSecurityPolicy api objects. -package podsecuritypolicy // import "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy" +package podsecuritypolicy // import "k8s.io/kubernetes/pkg/registry/policy/podsecuritypolicy" diff --git a/pkg/registry/extensions/podsecuritypolicy/storage/BUILD b/pkg/registry/policy/podsecuritypolicy/storage/BUILD similarity index 88% rename from pkg/registry/extensions/podsecuritypolicy/storage/BUILD rename to pkg/registry/policy/podsecuritypolicy/storage/BUILD index 222b6e3bad..b4b03dd8c8 100644 --- a/pkg/registry/extensions/podsecuritypolicy/storage/BUILD +++ b/pkg/registry/policy/podsecuritypolicy/storage/BUILD @@ -27,14 +27,13 @@ go_test( go_library( name = "go_default_library", srcs = ["storage.go"], - importpath = "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy/storage", + importpath = "k8s.io/kubernetes/pkg/registry/policy/podsecuritypolicy/storage", deps = [ "//pkg/apis/policy:go_default_library", "//pkg/printers:go_default_library", "//pkg/printers/internalversion:go_default_library", "//pkg/printers/storage:go_default_library", - "//pkg/registry/extensions/podsecuritypolicy:go_default_library", - "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", + "//pkg/registry/policy/podsecuritypolicy:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/extensions/podsecuritypolicy/storage/storage.go b/pkg/registry/policy/podsecuritypolicy/storage/storage.go similarity index 92% rename from pkg/registry/extensions/podsecuritypolicy/storage/storage.go rename to pkg/registry/policy/podsecuritypolicy/storage/storage.go index 20b3f651b2..5e8e5c6963 100644 --- a/pkg/registry/extensions/podsecuritypolicy/storage/storage.go +++ b/pkg/registry/policy/podsecuritypolicy/storage/storage.go @@ -17,7 +17,6 @@ limitations under the License. package storage import ( - extensions "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" @@ -25,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/printers" printersinternal "k8s.io/kubernetes/pkg/printers/internalversion" printerstorage "k8s.io/kubernetes/pkg/printers/storage" - "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy" + "k8s.io/kubernetes/pkg/registry/policy/podsecuritypolicy" ) // REST implements a RESTStorage for PodSecurityPolicies. @@ -38,7 +37,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST { store := &genericregistry.Store{ NewFunc: func() runtime.Object { return &policy.PodSecurityPolicy{} }, NewListFunc: func() runtime.Object { return &policy.PodSecurityPolicyList{} }, - DefaultQualifiedResource: extensions.Resource("podsecuritypolicies"), + DefaultQualifiedResource: policy.Resource("podsecuritypolicies"), CreateStrategy: podsecuritypolicy.Strategy, UpdateStrategy: podsecuritypolicy.Strategy, diff --git a/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go b/pkg/registry/policy/podsecuritypolicy/storage/storage_test.go similarity index 100% rename from pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go rename to pkg/registry/policy/podsecuritypolicy/storage/storage_test.go diff --git a/pkg/registry/extensions/podsecuritypolicy/strategy.go b/pkg/registry/policy/podsecuritypolicy/strategy.go similarity index 100% rename from pkg/registry/extensions/podsecuritypolicy/strategy.go rename to pkg/registry/policy/podsecuritypolicy/strategy.go diff --git a/pkg/registry/policy/rest/BUILD b/pkg/registry/policy/rest/BUILD index 904fd2078d..bbbc326452 100644 --- a/pkg/registry/policy/rest/BUILD +++ b/pkg/registry/policy/rest/BUILD @@ -12,8 +12,8 @@ go_library( deps = [ "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/policy:go_default_library", - "//pkg/registry/extensions/podsecuritypolicy/storage:go_default_library", "//pkg/registry/policy/poddisruptionbudget/storage:go_default_library", + "//pkg/registry/policy/podsecuritypolicy/storage:go_default_library", "//vendor/k8s.io/api/policy/v1beta1:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library", diff --git a/pkg/registry/policy/rest/storage_policy.go b/pkg/registry/policy/rest/storage_policy.go index 153686d76a..083da47153 100644 --- a/pkg/registry/policy/rest/storage_policy.go +++ b/pkg/registry/policy/rest/storage_policy.go @@ -24,8 +24,8 @@ import ( serverstorage "k8s.io/apiserver/pkg/server/storage" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/apis/policy" - pspstore "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy/storage" poddisruptionbudgetstore "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget/storage" + pspstore "k8s.io/kubernetes/pkg/registry/policy/podsecuritypolicy/storage" ) type RESTStorageProvider struct{} diff --git a/test/integration/etcd/etcd_storage_path_test.go b/test/integration/etcd/etcd_storage_path_test.go index fc7d49a949..a1f5c17dbe 100644 --- a/test/integration/etcd/etcd_storage_path_test.go +++ b/test/integration/etcd/etcd_storage_path_test.go @@ -262,6 +262,7 @@ var etcdStorageData = map[schema.GroupVersionResource]struct { gvr("extensions", "v1beta1", "podsecuritypolicies"): { stub: `{"metadata": {"name": "psp1"}, "spec": {"fsGroup": {"rule": "RunAsAny"}, "privileged": true, "runAsUser": {"rule": "RunAsAny"}, "seLinux": {"rule": "MustRunAs"}, "supplementalGroups": {"rule": "RunAsAny"}}}`, expectedEtcdPath: "/registry/podsecuritypolicy/psp1", + expectedGVK: gvkP("policy", "v1beta1", "PodSecurityPolicy"), }, gvr("extensions", "v1beta1", "ingresses"): { stub: `{"metadata": {"name": "ingress1"}, "spec": {"backend": {"serviceName": "service", "servicePort": 5000}}}`, @@ -299,7 +300,6 @@ var etcdStorageData = map[schema.GroupVersionResource]struct { gvr("policy", "v1beta1", "podsecuritypolicies"): { stub: `{"metadata": {"name": "psp2"}, "spec": {"fsGroup": {"rule": "RunAsAny"}, "privileged": true, "runAsUser": {"rule": "RunAsAny"}, "seLinux": {"rule": "MustRunAs"}, "supplementalGroups": {"rule": "RunAsAny"}}}`, expectedEtcdPath: "/registry/podsecuritypolicy/psp2", - expectedGVK: gvkP("extensions", "v1beta1", "PodSecurityPolicy"), }, // -- diff --git a/test/test_owners.csv b/test/test_owners.csv index 173b536724..f4a0fb6a11 100644 --- a/test/test_owners.csv +++ b/test/test_owners.csv @@ -749,12 +749,12 @@ k8s.io/kubernetes/pkg/registry/extensions/deployment,dchen1107,1, k8s.io/kubernetes/pkg/registry/extensions/deployment/storage,timothysc,1, k8s.io/kubernetes/pkg/registry/extensions/ingress,apelisse,1, k8s.io/kubernetes/pkg/registry/extensions/ingress/storage,luxas,1, -k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy/storage,dchen1107,1, k8s.io/kubernetes/pkg/registry/extensions/replicaset,rrati,0, k8s.io/kubernetes/pkg/registry/extensions/replicaset/storage,wojtek-t,1, k8s.io/kubernetes/pkg/registry/extensions/rest,rrati,0, k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget,Q-Lee,1, k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget/storage,dchen1107,1, +k8s.io/kubernetes/pkg/registry/policy/podsecuritypolicy/storage,dchen1107,1, k8s.io/kubernetes/pkg/registry/rbac/reconciliation,roberthbailey,1, k8s.io/kubernetes/pkg/registry/rbac/validation,rkouj,0, k8s.io/kubernetes/pkg/registry/storage/storageclass,brendandburns,1,