Skip to content

K
k3s
Unverified Commit 93cd5590 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #58832 from liggitt/move-workload-internal-types

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Move workload registries to apps package xref #43214 Starts the process of moving internal types to the apps packages for apps types ```release-note NONE ```
parents b40f865a ae41593f
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 45 deletions
hack/.golint_failures
View file @ 93cd5590
......@@ -241,6 +241,12 @@ pkg/registry/admissionregistration/initializerconfiguration/storage
pkg/registry/admissionregistration/mutatingwebhookconfiguration/storage
pkg/registry/admissionregistration/rest
pkg/registry/admissionregistration/validatingwebhookconfiguration/storage
pkg/registry/apps/daemonset
pkg/registry/apps/daemonset/storage
pkg/registry/apps/deployment
pkg/registry/apps/deployment/storage
pkg/registry/apps/replicaset
pkg/registry/apps/replicaset/storage
pkg/registry/apps/rest
pkg/registry/apps/statefulset
pkg/registry/apps/statefulset/storage
......@@ -294,14 +300,8 @@ pkg/registry/core/service/storage
pkg/registry/core/serviceaccount/storage
pkg/registry/events/rest
pkg/registry/extensions/controller/storage
pkg/registry/extensions/daemonset
pkg/registry/extensions/daemonset/storage
pkg/registry/extensions/deployment
pkg/registry/extensions/deployment/storage
pkg/registry/extensions/ingress
pkg/registry/extensions/ingress/storage
pkg/registry/extensions/replicaset
pkg/registry/extensions/replicaset/storage
pkg/registry/extensions/rest
pkg/registry/networking/networkpolicy/storage
pkg/registry/networking/rest
......
pkg/registry/BUILD
View file @ 93cd5590
......@@ -27,6 +27,9 @@ filegroup(
"//pkg/registry/admissionregistration/rest:all-srcs",
"//pkg/registry/admissionregistration/validatingwebhookconfiguration:all-srcs",
"//pkg/registry/apps/controllerrevision:all-srcs",
"//pkg/registry/apps/daemonset:all-srcs",
"//pkg/registry/apps/deployment:all-srcs",
"//pkg/registry/apps/replicaset:all-srcs",
"//pkg/registry/apps/rest:all-srcs",
"//pkg/registry/apps/statefulset:all-srcs",
"//pkg/registry/authentication/rest:all-srcs",
......@@ -66,11 +69,8 @@ filegroup(
"//pkg/registry/events/event:all-srcs",
"//pkg/registry/events/rest:all-srcs",
"//pkg/registry/extensions/controller/storage:all-srcs",
"//pkg/registry/extensions/daemonset:all-srcs",
"//pkg/registry/extensions/deployment:all-srcs",
"//pkg/registry/extensions/ingress:all-srcs",
"//pkg/registry/extensions/podsecuritypolicy:all-srcs",
"//pkg/registry/extensions/replicaset:all-srcs",
"//pkg/registry/extensions/rest:all-srcs",
"//pkg/registry/networking/networkpolicy:all-srcs",
"//pkg/registry/networking/rest:all-srcs",
......
pkg/registry/extensions/daemonset/BUILD → pkg/registry/apps/daemonset/BUILD
View file @ 93cd5590
......@@ -12,7 +12,7 @@ go_library(
"doc.go",
"strategy.go",
],
importpath = "k8s.io/kubernetes/pkg/registry/extensions/daemonset",
importpath = "k8s.io/kubernetes/pkg/registry/apps/daemonset",
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/pod:go_default_library",
......@@ -35,7 +35,7 @@ go_test(
name = "go_default_test",
srcs = ["strategy_test.go"],
embed = [":go_default_library"],
importpath = "k8s.io/kubernetes/pkg/registry/extensions/daemonset",
importpath = "k8s.io/kubernetes/pkg/registry/apps/daemonset",
deps = [
"//pkg/apis/core:go_default_library",
"//pkg/apis/extensions:go_default_library",
......@@ -57,7 +57,7 @@ filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//pkg/registry/extensions/daemonset/storage:all-srcs",
"//pkg/registry/apps/daemonset/storage:all-srcs",
],
tags = ["automanaged"],
)
pkg/registry/extensions/daemonset/doc.go → pkg/registry/apps/daemonset/doc.go
View file @ 93cd5590
......@@ -16,4 +16,4 @@ limitations under the License.
// Package daemonset provides Registry interface and its RESTStorage
// implementation for storing DaemonSet api objects.
package daemonset // import "k8s.io/kubernetes/pkg/registry/extensions/daemonset"
package daemonset // import "k8s.io/kubernetes/pkg/registry/apps/daemonset"
pkg/registry/extensions/daemonset/storage/BUILD → pkg/registry/apps/daemonset/storage/BUILD
View file @ 93cd5590
......@@ -10,7 +10,7 @@ go_test(
name = "go_default_test",
srcs = ["storage_test.go"],
embed = [":go_default_library"],
importpath = "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage",
importpath = "k8s.io/kubernetes/pkg/registry/apps/daemonset/storage",
deps = [
"//pkg/apis/core:go_default_library",
"//pkg/apis/extensions:go_default_library",
......@@ -28,13 +28,13 @@ go_test(
go_library(
name = "go_default_library",
srcs = ["storage.go"],
importpath = "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage",
importpath = "k8s.io/kubernetes/pkg/registry/apps/daemonset/storage",
deps = [
"//pkg/apis/extensions:go_default_library",
"//pkg/printers:go_default_library",
"//pkg/printers/internalversion:go_default_library",
"//pkg/printers/storage:go_default_library",
"//pkg/registry/extensions/daemonset:go_default_library",
"//pkg/registry/apps/daemonset:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library",
......
pkg/registry/extensions/daemonset/storage/storage.go → pkg/registry/apps/daemonset/storage/storage.go
View file @ 93cd5590
......@@ -27,7 +27,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/daemonset"
"k8s.io/kubernetes/pkg/registry/apps/daemonset"
)
// rest implements a RESTStorage for DaemonSets
......
pkg/registry/extensions/deployment/BUILD → pkg/registry/apps/deployment/BUILD
View file @ 93cd5590
......@@ -13,7 +13,7 @@ go_library(
"registry.go",
"strategy.go",
],
importpath = "k8s.io/kubernetes/pkg/registry/extensions/deployment",
importpath = "k8s.io/kubernetes/pkg/registry/apps/deployment",
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/pod:go_default_library",
......@@ -39,7 +39,7 @@ go_test(
name = "go_default_test",
srcs = ["strategy_test.go"],
embed = [":go_default_library"],
importpath = "k8s.io/kubernetes/pkg/registry/extensions/deployment",
importpath = "k8s.io/kubernetes/pkg/registry/apps/deployment",
deps = [
"//pkg/apis/core:go_default_library",
"//pkg/apis/extensions:go_default_library",
......@@ -63,7 +63,7 @@ filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//pkg/registry/extensions/deployment/storage:all-srcs",
"//pkg/registry/apps/deployment/storage:all-srcs",
],
tags = ["automanaged"],
)
pkg/registry/extensions/deployment/doc.go → pkg/registry/apps/deployment/doc.go
View file @ 93cd5590
......@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package deployment // import "k8s.io/kubernetes/pkg/registry/extensions/deployment"
package deployment // import "k8s.io/kubernetes/pkg/registry/apps/deployment"
pkg/registry/extensions/deployment/storage/BUILD → pkg/registry/apps/deployment/storage/BUILD
View file @ 93cd5590
......@@ -10,7 +10,7 @@ go_test(
name = "go_default_test",
srcs = ["storage_test.go"],
embed = [":go_default_library"],
importpath = "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage",
importpath = "k8s.io/kubernetes/pkg/registry/apps/deployment/storage",
deps = [
"//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/core:go_default_library",
......@@ -36,7 +36,7 @@ go_test(
go_library(
name = "go_default_library",
srcs = ["storage.go"],
importpath = "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage",
importpath = "k8s.io/kubernetes/pkg/registry/apps/deployment/storage",
deps = [
"//pkg/apis/apps/v1beta1:go_default_library",
"//pkg/apis/apps/v1beta2:go_default_library",
......@@ -46,7 +46,7 @@ go_library(
"//pkg/apis/extensions:go_default_library",
"//pkg/apis/extensions/v1beta1:go_default_library",
"//pkg/apis/extensions/validation:go_default_library",
"//pkg/registry/extensions/deployment:go_default_library",
"//pkg/registry/apps/deployment:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
......
pkg/registry/extensions/deployment/storage/storage.go → pkg/registry/apps/deployment/storage/storage.go
View file @ 93cd5590
......@@ -38,7 +38,7 @@ import (
"k8s.io/kubernetes/pkg/apis/extensions"
extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation"
"k8s.io/kubernetes/pkg/registry/extensions/deployment"
"k8s.io/kubernetes/pkg/registry/apps/deployment"
)
// DeploymentStorage includes dummy storage for Deployments and for Scale subresource.
......
pkg/registry/extensions/replicaset/BUILD → pkg/registry/apps/replicaset/BUILD
View file @ 93cd5590
......@@ -13,7 +13,7 @@ go_library(
"registry.go",
"strategy.go",
],
importpath = "k8s.io/kubernetes/pkg/registry/extensions/replicaset",
importpath = "k8s.io/kubernetes/pkg/registry/apps/replicaset",
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/pod:go_default_library",
......@@ -43,7 +43,7 @@ go_test(
name = "go_default_test",
srcs = ["strategy_test.go"],
embed = [":go_default_library"],
importpath = "k8s.io/kubernetes/pkg/registry/extensions/replicaset",
importpath = "k8s.io/kubernetes/pkg/registry/apps/replicaset",
deps = [
"//pkg/apis/core:go_default_library",
"//pkg/apis/extensions:go_default_library",
......@@ -65,7 +65,7 @@ filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//pkg/registry/extensions/replicaset/storage:all-srcs",
"//pkg/registry/apps/replicaset/storage:all-srcs",
],
tags = ["automanaged"],
)
pkg/registry/extensions/replicaset/doc.go → pkg/registry/apps/replicaset/doc.go
View file @ 93cd5590
......@@ -16,4 +16,4 @@ limitations under the License.
// Package replicaset provides Registry interface and it's RESTStorage
// implementation for storing ReplicaSet api objects.
package replicaset // import "k8s.io/kubernetes/pkg/registry/extensions/replicaset"
package replicaset // import "k8s.io/kubernetes/pkg/registry/apps/replicaset"
pkg/registry/extensions/replicaset/storage/BUILD → pkg/registry/apps/replicaset/storage/BUILD
View file @ 93cd5590
......@@ -10,7 +10,7 @@ go_test(
name = "go_default_test",
srcs = ["storage_test.go"],
embed = [":go_default_library"],
importpath = "k8s.io/kubernetes/pkg/registry/extensions/replicaset/storage",
importpath = "k8s.io/kubernetes/pkg/registry/apps/replicaset/storage",
deps = [
"//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/core:go_default_library",
......@@ -34,7 +34,7 @@ go_test(
go_library(
name = "go_default_library",
srcs = ["storage.go"],
importpath = "k8s.io/kubernetes/pkg/registry/extensions/replicaset/storage",
importpath = "k8s.io/kubernetes/pkg/registry/apps/replicaset/storage",
deps = [
"//pkg/apis/apps/v1beta1:go_default_library",
"//pkg/apis/apps/v1beta2:go_default_library",
......@@ -46,7 +46,7 @@ go_library(
"//pkg/printers:go_default_library",
"//pkg/printers/internalversion:go_default_library",
"//pkg/printers/storage:go_default_library",
"//pkg/registry/extensions/replicaset:go_default_library",
"//pkg/registry/apps/replicaset:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
......
pkg/registry/extensions/replicaset/storage/storage.go → pkg/registry/apps/replicaset/storage/storage.go
View file @ 93cd5590
......@@ -39,7 +39,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/replicaset"
"k8s.io/kubernetes/pkg/registry/apps/replicaset"
)
// ReplicaSetStorage includes dummy storage for ReplicaSets and for Scale subresource.
......
pkg/registry/apps/rest/BUILD
View file @ 93cd5590
......@@ -13,10 +13,10 @@ go_library(
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/apps:go_default_library",
"//pkg/registry/apps/controllerrevision/storage:go_default_library",
"//pkg/registry/apps/daemonset/storage:go_default_library",
"//pkg/registry/apps/deployment/storage:go_default_library",
"//pkg/registry/apps/replicaset/storage:go_default_library",
"//pkg/registry/apps/statefulset/storage:go_default_library",
"//pkg/registry/extensions/daemonset/storage:go_default_library",
"//pkg/registry/extensions/deployment/storage:go_default_library",
"//pkg/registry/extensions/replicaset/storage:go_default_library",
"//vendor/k8s.io/api/apps/v1:go_default_library",
"//vendor/k8s.io/api/apps/v1beta1:go_default_library",
"//vendor/k8s.io/api/apps/v1beta2:go_default_library",
......
pkg/registry/apps/rest/storage_apps.go
View file @ 93cd5590
......@@ -27,10 +27,10 @@ import (
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/apps"
controllerrevisionsstore "k8s.io/kubernetes/pkg/registry/apps/controllerrevision/storage"
daemonsetstore "k8s.io/kubernetes/pkg/registry/apps/daemonset/storage"
deploymentstore "k8s.io/kubernetes/pkg/registry/apps/deployment/storage"
replicasetstore "k8s.io/kubernetes/pkg/registry/apps/replicaset/storage"
statefulsetstore "k8s.io/kubernetes/pkg/registry/apps/statefulset/storage"
daemonsetstore "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage"
deploymentstore "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage"
replicasetstore "k8s.io/kubernetes/pkg/registry/extensions/replicaset/storage"
)
type RESTStorageProvider struct{}
......
pkg/registry/extensions/rest/BUILD
View file @ 93cd5590
......@@ -12,12 +12,12 @@ go_library(
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/extensions:go_default_library",
"//pkg/registry/apps/daemonset/storage:go_default_library",
"//pkg/registry/apps/deployment/storage:go_default_library",
"//pkg/registry/apps/replicaset/storage:go_default_library",
"//pkg/registry/extensions/controller/storage:go_default_library",
"//pkg/registry/extensions/daemonset/storage:go_default_library",
"//pkg/registry/extensions/deployment/storage:go_default_library",
"//pkg/registry/extensions/ingress/storage:go_default_library",
"//pkg/registry/extensions/podsecuritypolicy/storage:go_default_library",
"//pkg/registry/extensions/replicaset/storage:go_default_library",
"//pkg/registry/networking/networkpolicy/storage:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library",
......
pkg/registry/extensions/rest/storage_extensions.go
View file @ 93cd5590
......@@ -24,12 +24,12 @@ import (
serverstorage "k8s.io/apiserver/pkg/server/storage"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/extensions"
daemonstore "k8s.io/kubernetes/pkg/registry/apps/daemonset/storage"
deploymentstore "k8s.io/kubernetes/pkg/registry/apps/deployment/storage"
replicasetstore "k8s.io/kubernetes/pkg/registry/apps/replicaset/storage"
expcontrollerstore "k8s.io/kubernetes/pkg/registry/extensions/controller/storage"
daemonstore "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage"
deploymentstore "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage"
ingressstore "k8s.io/kubernetes/pkg/registry/extensions/ingress/storage"
pspstore "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy/storage"
replicasetstore "k8s.io/kubernetes/pkg/registry/extensions/replicaset/storage"
networkpolicystore "k8s.io/kubernetes/pkg/registry/networking/networkpolicy/storage"
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment