diff --git a/cmd/kube-apiserver/app/BUILD b/cmd/kube-apiserver/app/BUILD index 53d700e5ead..5e676ab4f8b 100644 --- a/cmd/kube-apiserver/app/BUILD +++ b/cmd/kube-apiserver/app/BUILD @@ -74,6 +74,10 @@ go_library( "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apiserver:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/cmd/server:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/openapi:go_default_library", @@ -98,10 +102,6 @@ go_library( "//vendor/k8s.io/kube-aggregator/pkg/apiserver:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/controllers/autoregister:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apiserver:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/cmd/server:go_default_library", ], ) diff --git a/cmd/kube-apiserver/app/aggregator.go b/cmd/kube-apiserver/app/aggregator.go index 9c9d587d141..bdf8b8a2e87 100644 --- a/cmd/kube-apiserver/app/aggregator.go +++ b/cmd/kube-apiserver/app/aggregator.go @@ -25,6 +25,7 @@ import ( "net/http" "strings" + apiextensionsinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" @@ -37,7 +38,6 @@ import ( aggregatorapiserver "k8s.io/kube-aggregator/pkg/apiserver" apiregistrationclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" "k8s.io/kube-aggregator/pkg/controllers/autoregister" - apiextensionsinformers "k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion" "k8s.io/kubernetes/pkg/master/thirdparty" diff --git a/cmd/kube-apiserver/app/apiextensions.go b/cmd/kube-apiserver/app/apiextensions.go index 176b44c5c89..5c0b19f1ece 100644 --- a/cmd/kube-apiserver/app/apiextensions.go +++ b/cmd/kube-apiserver/app/apiextensions.go @@ -20,11 +20,11 @@ limitations under the License. package app import ( + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + apiextensionsapiserver "k8s.io/apiextensions-apiserver/pkg/apiserver" + apiextensionscmd "k8s.io/apiextensions-apiserver/pkg/cmd/server" genericapiserver "k8s.io/apiserver/pkg/server" genericoptions "k8s.io/apiserver/pkg/server/options" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" - apiextensionsapiserver "k8s.io/kube-apiextensions-server/pkg/apiserver" - apiextensionscmd "k8s.io/kube-apiextensions-server/pkg/cmd/server" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" ) diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go index 9a426892f53..975310953a0 100644 --- a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go +++ b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go @@ -69,8 +69,8 @@ func New() *Generator { `k8s.io/apimachinery/pkg/apis/meta/v1`, `k8s.io/apimachinery/pkg/apis/meta/v1alpha1`, `k8s.io/apiserver/pkg/apis/example/v1`, + `k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1`, `k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1`, - `k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1`, `k8s.io/kubernetes/pkg/api/v1`, `k8s.io/kubernetes/pkg/apis/policy/v1beta1`, `k8s.io/kubernetes/pkg/apis/extensions/v1beta1`, diff --git a/hack/.linted_packages b/hack/.linted_packages index abf236ea6ce..cda525bb924 100644 --- a/hack/.linted_packages +++ b/hack/.linted_packages @@ -321,6 +321,18 @@ plugin/pkg/scheduler plugin/pkg/scheduler/algorithmprovider plugin/pkg/scheduler/algorithmprovider/defaults plugin/pkg/scheduler/api/validation +staging/src/k8s.io/apiextensions-apiserver +staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install +staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation +staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions +staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions +staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1beta1 +staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion +staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions +staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion +staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion +staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1 +staging/src/k8s.io/apiextensions-apiserver/test/integration staging/src/k8s.io/apimachinery/pkg/api/equality staging/src/k8s.io/apimachinery/pkg/api/errors staging/src/k8s.io/apimachinery/pkg/api/resource @@ -436,18 +448,6 @@ staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregis staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1beta1 staging/src/k8s.io/kube-aggregator/pkg/controllers -staging/src/k8s.io/kube-apiextensions-server -staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install -staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/validation -staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions -staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions -staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1 -staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion -staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions -staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion -staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion -staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1 -staging/src/k8s.io/kube-apiextensions-server/test/integration staging/src/k8s.io/metrics/pkg/apis/custom_metrics/install staging/src/k8s.io/metrics/pkg/apis/metrics/install staging/src/k8s.io/sample-apiserver diff --git a/hack/godep-save.sh b/hack/godep-save.sh index 3b7667dbbeb..085304dff25 100755 --- a/hack/godep-save.sh +++ b/hack/godep-save.sh @@ -50,8 +50,8 @@ pushd "${KUBE_ROOT}" > /dev/null if [ ! -e "vendor/k8s.io/kube-aggregator" ]; then ln -s ../../staging/src/k8s.io/kube-aggregator vendor/k8s.io/kube-aggregator fi - if [ ! -e "vendor/k8s.io/kube-apiextensions-server" ]; then - ln -s ../../staging/src/k8s.io/kube-apiextensions-server vendor/k8s.io/kube-apiextensions-server + if [ ! -e "vendor/k8s.io/apiextensions-apiserver" ]; then + ln -s ../../staging/src/k8s.io/apiextensions-apiserver vendor/k8s.io/apiextensions-apiserver fi if [ ! -e "vendor/k8s.io/sample-apiserver" ]; then ln -s ../../staging/src/k8s.io/sample-apiserver vendor/k8s.io/sample-apiserver diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index ce3bea0fa22..a2d2635a5f5 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -30,7 +30,7 @@ kube::golang::server_targets() { cmd/kubeadm cmd/hyperkube vendor/k8s.io/kube-aggregator - vendor/k8s.io/kube-apiextensions-server + vendor/k8s.io/apiextensions-apiserver plugin/cmd/kube-scheduler ) echo "${targets[@]}" diff --git a/hack/make-rules/helpers/cache_go_dirs.sh b/hack/make-rules/helpers/cache_go_dirs.sh index 27415532659..0fafd5a609e 100755 --- a/hack/make-rules/helpers/cache_go_dirs.sh +++ b/hack/make-rules/helpers/cache_go_dirs.sh @@ -39,7 +39,7 @@ function kfind() { # include the "special" vendor directories which are actually part # of the Kubernetes source tree - generators will use these for # including certain core API concepts. - find -H . ./vendor/k8s.io/apimachinery ./vendor/k8s.io/apiserver ./vendor/k8s.io/kube-aggregator ./vendor/k8s.io/kube-apiextensions-server ./vendor/k8s.io/metrics ./vendor/k8s.io/sample-apiserver \ + find -H . ./vendor/k8s.io/apimachinery ./vendor/k8s.io/apiserver ./vendor/k8s.io/kube-aggregator ./vendor/k8s.io/apiextensions-apiserver ./vendor/k8s.io/metrics ./vendor/k8s.io/sample-apiserver \ \( \ -not \( \ \( \ diff --git a/hack/make-rules/test-integration.sh b/hack/make-rules/test-integration.sh index 865328b6cb7..f0f040c682b 100755 --- a/hack/make-rules/test-integration.sh +++ b/hack/make-rules/test-integration.sh @@ -44,7 +44,7 @@ kube::test::find_integration_test_dirs() { find test/integration/ -name '*_test.go' -print0 \ | xargs -0n1 dirname | sed "s|^|${KUBE_GO_PACKAGE}/|" \ | LC_ALL=C sort -u - find vendor/k8s.io/kube-apiextensions-server/test/integration/ -name '*_test.go' -print0 \ + find vendor/k8s.io/apiextensions-apiserver/test/integration/ -name '*_test.go' -print0 \ | xargs -0n1 dirname | sed "s|^|${KUBE_GO_PACKAGE}/|" \ | LC_ALL=C sort -u ) diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh index fddcc3ec56a..399b367419d 100755 --- a/hack/make-rules/test.sh +++ b/hack/make-rules/test.sh @@ -86,7 +86,7 @@ kube::test::find_dirs() { find ./staging/src/k8s.io/kube-aggregator -name '*_test.go' \ -name '*_test.go' -print0 | xargs -0n1 dirname | sed 's|^\./staging/src/|./vendor/|' | LC_ALL=C sort -u - find ./staging/src/k8s.io/kube-apiextensions-server -not \( \ + find ./staging/src/k8s.io/apiextensions-apiserver -not \( \ \( \ -path '*/test/integration/*' \ \) -prune \ diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 4b809eb7be0..5a8e25be185 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -103,5 +103,5 @@ ${informergen} \ # call generation on sub-project for now vendor/k8s.io/kube-aggregator/hack/update-codegen.sh vendor/k8s.io/sample-apiserver/hack/update-codegen.sh -vendor/k8s.io/kube-apiextensions-server/hack/update-codegen.sh +vendor/k8s.io/apiextensions-apiserver/hack/update-codegen.sh vendor/k8s.io/metrics/hack/update-codegen.sh diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh index 36970fe7503..395c222362d 100755 --- a/hack/verify-codegen.sh +++ b/hack/verify-codegen.sh @@ -26,7 +26,7 @@ kube::golang::setup_env # call verify on sub-project for now vendor/k8s.io/kube-aggregator/hack/verify-codegen.sh vendor/k8s.io/sample-apiserver/hack/verify-codegen.sh -vendor/k8s.io/kube-apiextensions-server/hack/verify-codegen.sh +vendor/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh vendor/k8s.io/metrics/hack/verify-codegen.sh "${KUBE_ROOT}/hack/update-codegen.sh" --verify-only diff --git a/hack/verify-staging-imports.sh b/hack/verify-staging-imports.sh index abff35db45a..e2a672c5028 100755 --- a/hack/verify-staging-imports.sh +++ b/hack/verify-staging-imports.sh @@ -70,6 +70,7 @@ print_forbidden_imports client-go k8s.io/apimachinery || RC=1 print_forbidden_imports apiserver k8s.io/apimachinery k8s.io/client-go || RC=1 print_forbidden_imports kube-aggregator k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver || RC=1 print_forbidden_imports sample-apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver || RC=1 +print_forbidden_imports apiextensions-apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver || RC=1 if [ ${RC} != 0 ]; then exit ${RC} fi diff --git a/pkg/master/thirdparty/BUILD b/pkg/master/thirdparty/BUILD index c32b4824273..2e2a14bd5ff 100644 --- a/pkg/master/thirdparty/BUILD +++ b/pkg/master/thirdparty/BUILD @@ -25,6 +25,12 @@ go_library( "//pkg/registry/extensions/thirdpartyresourcedata:go_default_library", "//pkg/registry/extensions/thirdpartyresourcedata/storage:go_default_library", "//vendor/github.com/golang/glog:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apiserver:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/registry/customresource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", @@ -47,12 +53,6 @@ go_library( "//vendor/k8s.io/client-go/tools/cache:go_default_library", "//vendor/k8s.io/client-go/util/workqueue:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apiserver:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/registry/customresource:go_default_library", ], ) @@ -77,12 +77,12 @@ go_test( deps = [ "//pkg/apis/extensions:go_default_library", "//pkg/client/listers/extensions/internalversion:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", "//vendor/k8s.io/client-go/util/workqueue:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion:go_default_library", ], ) diff --git a/pkg/master/thirdparty/thirdparty.go b/pkg/master/thirdparty/thirdparty.go index 27788c89486..e1a463a660c 100644 --- a/pkg/master/thirdparty/thirdparty.go +++ b/pkg/master/thirdparty/thirdparty.go @@ -23,6 +23,10 @@ import ( "github.com/golang/glog" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" + apiextensionsserver "k8s.io/apiextensions-apiserver/pkg/apiserver" + apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion" + "k8s.io/apiextensions-apiserver/pkg/registry/customresource" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -41,10 +45,6 @@ import ( serverstorgage "k8s.io/apiserver/pkg/server/storage" "k8s.io/apiserver/pkg/storage/storagebackend" discoveryclient "k8s.io/client-go/discovery" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" - apiextensionsserver "k8s.io/kube-apiextensions-server/pkg/apiserver" - apiextensionsclient "k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion" - "k8s.io/kube-apiextensions-server/pkg/registry/customresource" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" extensionsrest "k8s.io/kubernetes/pkg/registry/extensions/rest" diff --git a/pkg/master/thirdparty/tprregistration_controller.go b/pkg/master/thirdparty/tprregistration_controller.go index 0c5f055efe3..d731635d290 100644 --- a/pkg/master/thirdparty/tprregistration_controller.go +++ b/pkg/master/thirdparty/tprregistration_controller.go @@ -22,6 +22,9 @@ import ( "github.com/golang/glog" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" + crdinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion" + crdlisters "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" @@ -30,9 +33,6 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" "k8s.io/kube-aggregator/pkg/apis/apiregistration" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" - crdinformers "k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion" - crdlisters "k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion" "k8s.io/kubernetes/pkg/apis/extensions" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion/extensions/internalversion" listers "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion" diff --git a/pkg/master/thirdparty/tprregistration_controller_test.go b/pkg/master/thirdparty/tprregistration_controller_test.go index e4048fc413f..57015752344 100644 --- a/pkg/master/thirdparty/tprregistration_controller_test.go +++ b/pkg/master/thirdparty/tprregistration_controller_test.go @@ -20,13 +20,13 @@ import ( "reflect" "testing" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" + crdlisters "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" "k8s.io/kube-aggregator/pkg/apis/apiregistration" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" - crdlisters "k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion" "k8s.io/kubernetes/pkg/apis/extensions" listers "k8s.io/kubernetes/pkg/client/listers/extensions/internalversion" ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/BUILD b/staging/src/k8s.io/apiextensions-apiserver/BUILD similarity index 79% rename from staging/src/k8s.io/kube-apiextensions-server/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/BUILD index 4b363a1ccf3..98351c5348b 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/BUILD @@ -9,7 +9,7 @@ load( ) go_binary( - name = "kube-apiextensions-server", + name = "apiextensions-apiserver", library = ":go_default_library", tags = ["automanaged"], ) @@ -19,8 +19,8 @@ go_library( srcs = ["main.go"], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/cmd/server:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/apiserver/pkg/util/logs:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/cmd/server:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/Godeps/Godeps.json b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json similarity index 99% rename from staging/src/k8s.io/kube-apiextensions-server/Godeps/Godeps.json rename to staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json index fce0919d185..4f2d6c5d475 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json @@ -1,5 +1,5 @@ { - "ImportPath": "k8s.io/kube-apiextensions-server", + "ImportPath": "k8s.io/apiextensions-apiserver", "GoVersion": "go1.8", "GodepVersion": "v79", "Packages": [ diff --git a/staging/src/k8s.io/kube-apiextensions-server/OWNERS b/staging/src/k8s.io/apiextensions-apiserver/OWNERS similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/OWNERS rename to staging/src/k8s.io/apiextensions-apiserver/OWNERS diff --git a/staging/src/k8s.io/kube-apiextensions-server/artifacts/customresource-01/noxu-apiservice.yaml b/staging/src/k8s.io/apiextensions-apiserver/artifacts/customresource-01/noxu-apiservice.yaml similarity index 87% rename from staging/src/k8s.io/kube-apiextensions-server/artifacts/customresource-01/noxu-apiservice.yaml rename to staging/src/k8s.io/apiextensions-apiserver/artifacts/customresource-01/noxu-apiservice.yaml index a11b3048a80..44d07f64139 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/artifacts/customresource-01/noxu-apiservice.yaml +++ b/staging/src/k8s.io/apiextensions-apiserver/artifacts/customresource-01/noxu-apiservice.yaml @@ -8,5 +8,5 @@ spec: priority: 500 service: name: api - namespace: kube-apiextensions + namespace: apiextensions version: v1alpha1 diff --git a/staging/src/k8s.io/kube-apiextensions-server/artifacts/customresource-01/noxu-resource-definition.yaml b/staging/src/k8s.io/apiextensions-apiserver/artifacts/customresource-01/noxu-resource-definition.yaml similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/artifacts/customresource-01/noxu-resource-definition.yaml rename to staging/src/k8s.io/apiextensions-apiserver/artifacts/customresource-01/noxu-resource-definition.yaml diff --git a/staging/src/k8s.io/kube-apiextensions-server/artifacts/customresource-01/noxu.yaml b/staging/src/k8s.io/apiextensions-apiserver/artifacts/customresource-01/noxu.yaml similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/artifacts/customresource-01/noxu.yaml rename to staging/src/k8s.io/apiextensions-apiserver/artifacts/customresource-01/noxu.yaml diff --git a/staging/src/k8s.io/kube-apiextensions-server/artifacts/example/apiservice.yaml b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/apiservice.yaml similarity index 87% rename from staging/src/k8s.io/kube-apiextensions-server/artifacts/example/apiservice.yaml rename to staging/src/k8s.io/apiextensions-apiserver/artifacts/example/apiservice.yaml index 820a5fa598c..332bb120ae7 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/artifacts/example/apiservice.yaml +++ b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/apiservice.yaml @@ -8,5 +8,5 @@ spec: priority: 100 service: name: api - namespace: kube-apiextensions + namespace: apiextensions version: v1alpha1 diff --git a/staging/src/k8s.io/kube-apiextensions-server/artifacts/example/auth-delegator.yaml b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-delegator.yaml similarity index 90% rename from staging/src/k8s.io/kube-apiextensions-server/artifacts/example/auth-delegator.yaml rename to staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-delegator.yaml index e9337f2aa27..f910f903a75 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/artifacts/example/auth-delegator.yaml +++ b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-delegator.yaml @@ -10,4 +10,4 @@ subjects: - apiVersion: v1 kind: ServiceAccount name: apiserver - namespace: kube-apiextensions + namespace: apiextensions diff --git a/staging/src/k8s.io/kube-apiextensions-server/artifacts/example/auth-reader.yaml b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-reader.yaml similarity index 90% rename from staging/src/k8s.io/kube-apiextensions-server/artifacts/example/auth-reader.yaml rename to staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-reader.yaml index a0e0998c765..9c897b62418 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/artifacts/example/auth-reader.yaml +++ b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-reader.yaml @@ -11,4 +11,4 @@ subjects: - apiVersion: v1 kind: ServiceAccount name: apiserver - namespace: kube-apiextensions + namespace: apiextensions diff --git a/staging/src/k8s.io/kube-apiextensions-server/artifacts/example/rc.yaml b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/rc.yaml similarity index 86% rename from staging/src/k8s.io/kube-apiextensions-server/artifacts/example/rc.yaml rename to staging/src/k8s.io/apiextensions-apiserver/artifacts/example/rc.yaml index 026c05acd35..d2bcefe7016 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/artifacts/example/rc.yaml +++ b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/rc.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ReplicationController metadata: name: apiextensions-server - namespace: kube-apiextensions + namespace: apiextensions labels: apiserver: "true" spec: @@ -17,7 +17,7 @@ spec: serviceAccountName: apiserver containers: - name: apiextensions-server - image: kube-apiextensions-server:latest + image: apiextensions-apiserver:latest imagePullPolicy: Never args: - "--etcd-servers=http://localhost:2379" diff --git a/staging/src/k8s.io/kube-apiextensions-server/artifacts/example/sa.yaml b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/sa.yaml similarity index 66% rename from staging/src/k8s.io/kube-apiextensions-server/artifacts/example/sa.yaml rename to staging/src/k8s.io/apiextensions-apiserver/artifacts/example/sa.yaml index 1fc4ca9f0b0..0f2e17f6a43 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/artifacts/example/sa.yaml +++ b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/sa.yaml @@ -2,4 +2,4 @@ kind: ServiceAccount apiVersion: v1 metadata: name: apiserver - namespace: kube-apiextensions + namespace: apiextensions diff --git a/staging/src/k8s.io/kube-apiextensions-server/artifacts/example/service.yaml b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/service.yaml similarity index 82% rename from staging/src/k8s.io/kube-apiextensions-server/artifacts/example/service.yaml rename to staging/src/k8s.io/apiextensions-apiserver/artifacts/example/service.yaml index 9749b888321..2b66f1d8aff 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/artifacts/example/service.yaml +++ b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: api - namespace: kube-apiextensions + namespace: apiextensions spec: ports: - port: 443 diff --git a/staging/src/k8s.io/kube-apiextensions-server/artifacts/simple-image/Dockerfile b/staging/src/k8s.io/apiextensions-apiserver/artifacts/simple-image/Dockerfile similarity index 89% rename from staging/src/k8s.io/kube-apiextensions-server/artifacts/simple-image/Dockerfile rename to staging/src/k8s.io/apiextensions-apiserver/artifacts/simple-image/Dockerfile index 0d782024f19..c41affec9a1 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/artifacts/simple-image/Dockerfile +++ b/staging/src/k8s.io/apiextensions-apiserver/artifacts/simple-image/Dockerfile @@ -13,5 +13,5 @@ # limitations under the License. FROM fedora -ADD kube-apiextensions-server / -ENTRYPOINT ["/kube-apiextensions-server"] +ADD apiextensions-apiserver / +ENTRYPOINT ["/apiextensions-apiserver"] diff --git a/staging/src/k8s.io/kube-apiextensions-server/hack/build-image.sh b/staging/src/k8s.io/apiextensions-apiserver/hack/build-image.sh similarity index 68% rename from staging/src/k8s.io/kube-apiextensions-server/hack/build-image.sh rename to staging/src/k8s.io/apiextensions-apiserver/hack/build-image.sh index a388f7ab89c..c9152a4de1c 100755 --- a/staging/src/k8s.io/kube-apiextensions-server/hack/build-image.sh +++ b/staging/src/k8s.io/apiextensions-apiserver/hack/build-image.sh @@ -20,11 +20,11 @@ source "${KUBE_ROOT}/hack/lib/util.sh" # Register function to be called on EXIT to remove generated binary. function cleanup { - rm "${KUBE_ROOT}/vendor/k8s.io/kube-apiextensions-server/artifacts/simple-image/kube-apiextensions-server" + rm "${KUBE_ROOT}/vendor/k8s.io/apiextensions-apiserver/artifacts/simple-image/apiextensions-apiserver" } trap cleanup EXIT -pushd "${KUBE_ROOT}/vendor/k8s.io/kube-apiextensions-server" -cp -v ../../../../_output/local/bin/linux/amd64/kube-apiextensions-server ./artifacts/simple-image/kube-apiextensions-server -docker build -t kube-apiextensions-server:latest ./artifacts/simple-image +pushd "${KUBE_ROOT}/vendor/k8s.io/apiextensions-apiserver" +cp -v ../../../../_output/local/bin/linux/amd64/apiextensions-apiserver ./artifacts/simple-image/apiextensions-apiserver +docker build -t apiextensions-apiserver:latest ./artifacts/simple-image popd diff --git a/staging/src/k8s.io/kube-apiextensions-server/hack/update-codegen.sh b/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh similarity index 69% rename from staging/src/k8s.io/kube-apiextensions-server/hack/update-codegen.sh rename to staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh index 2784f1b4f47..fae9395fc41 100755 --- a/staging/src/k8s.io/kube-apiextensions-server/hack/update-codegen.sh +++ b/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh @@ -43,14 +43,14 @@ echo "Building client-gen" CLIENTGEN="${PWD}/client-gen-binary" go build -o "${CLIENTGEN}" ./cmd/libs/go2idl/client-gen -PREFIX=k8s.io/kube-apiextensions-server/pkg/apis +PREFIX=k8s.io/apiextensions-apiserver/pkg/apis INPUT_BASE="--input-base ${PREFIX}" INPUT_APIS=( apiextensions/ apiextensions/v1beta1 ) INPUT="--input ${INPUT_APIS[@]}" -CLIENTSET_PATH="--clientset-path k8s.io/kube-apiextensions-server/pkg/client/clientset" +CLIENTSET_PATH="--clientset-path k8s.io/apiextensions-apiserver/pkg/client/clientset" ${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor ${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiextensions/v1beta1 ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor @@ -60,8 +60,8 @@ echo "Building lister-gen" listergen="${PWD}/lister-gen" go build -o "${listergen}" ./cmd/libs/go2idl/lister-gen -LISTER_INPUT="--input-dirs k8s.io/kube-apiextensions-server/pkg/apis/apiextensions --input-dirs k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" -LISTER_PATH="--output-package k8s.io/kube-apiextensions-server/pkg/client/listers" +LISTER_INPUT="--input-dirs k8s.io/apiextensions-apiserver/pkg/apis/apiextensions --input-dirs k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" +LISTER_PATH="--output-package k8s.io/apiextensions-apiserver/pkg/client/listers" ${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${KUBE_ROOT}/vendor @@ -71,9 +71,9 @@ go build -o "${informergen}" ./cmd/libs/go2idl/informer-gen ${informergen} \ --output-base ${KUBE_ROOT}/vendor \ - --input-dirs k8s.io/kube-apiextensions-server/pkg/apis/apiextensions --input-dirs k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1 \ - --versioned-clientset-package k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset \ - --internal-clientset-package k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset \ - --listers-package k8s.io/kube-apiextensions-server/pkg/client/listers \ - --output-package k8s.io/kube-apiextensions-server/pkg/client/informers + --input-dirs k8s.io/apiextensions-apiserver/pkg/apis/apiextensions --input-dirs k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1 \ + --versioned-clientset-package k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset \ + --internal-clientset-package k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset \ + --listers-package k8s.io/apiextensions-apiserver/pkg/client/listers \ + --output-package k8s.io/apiextensions-apiserver/pkg/client/informers "$@" diff --git a/staging/src/k8s.io/kube-apiextensions-server/hack/verify-codegen.sh b/staging/src/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/hack/verify-codegen.sh rename to staging/src/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh diff --git a/staging/src/k8s.io/kube-apiextensions-server/main.go b/staging/src/k8s.io/apiextensions-apiserver/main.go similarity index 95% rename from staging/src/k8s.io/kube-apiextensions-server/main.go rename to staging/src/k8s.io/apiextensions-apiserver/main.go index 503028572bb..5244c496f96 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/main.go +++ b/staging/src/k8s.io/apiextensions-apiserver/main.go @@ -21,9 +21,9 @@ import ( "os" "runtime" + "k8s.io/apiextensions-apiserver/pkg/cmd/server" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/util/logs" - "k8s.io/kube-apiextensions-server/pkg/cmd/server" ) func main() { diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/BUILD similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/BUILD diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/doc.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/doc.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/doc.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/helpers.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/helpers.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/helpers.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/helpers.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/helpers_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/helpers_test.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/helpers_test.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/helpers_test.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/BUILD similarity index 75% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/BUILD index cbfb0dad5fb..be3f73993e2 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/BUILD @@ -15,8 +15,8 @@ go_test( tags = ["automanaged"], deps = [ "//vendor/github.com/google/gofuzz:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/testing:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", ], ) @@ -25,11 +25,11 @@ go_library( srcs = ["install.go"], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/install.go similarity index 87% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/install.go index f568d22dad9..80157c8003b 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/install.go @@ -17,12 +17,12 @@ limitations under the License. package install import ( + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" "k8s.io/apimachinery/pkg/apimachinery/announced" "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" ) // Install registers the API group and adds types to a scheme @@ -32,7 +32,7 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r GroupName: apiextensions.GroupName, RootScopedKinds: sets.NewString("CustomResourceDefinition"), VersionPreferenceOrder: []string{v1beta1.SchemeGroupVersion.Version}, - ImportPrefix: "k8s.io/kube-apiextensions-server/pkg/apis/apiextension", + ImportPrefix: "k8s.io/apiextensions-apiserver/pkg/apis/apiextension", AddInternalObjectsToScheme: apiextensions.AddToScheme, }, announced.VersionToSchemeFunc{ diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/install_test.go similarity index 95% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install_test.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/install_test.go index 2ae09e9d327..351787932ef 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/install_test.go @@ -22,8 +22,8 @@ import ( "github.com/google/gofuzz" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" apitesting "k8s.io/apimachinery/pkg/api/testing" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" ) func TestRoundTripTypes(t *testing.T) { diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/register.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/register.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/register.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/register.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/types.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/types.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/types.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/types.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/BUILD similarity index 89% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/BUILD index 463b6fb965c..9a0c5380dee 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/BUILD @@ -22,10 +22,10 @@ go_library( tags = ["automanaged"], deps = [ "//vendor/github.com/gogo/protobuf/proto:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/defaults.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/defaults.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/defaults.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/defaults.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/doc.go similarity index 88% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/doc.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/doc.go index 6cf6a3d3ec0..54596291d32 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/doc.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/doc.go @@ -15,7 +15,7 @@ limitations under the License. */ // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions +// +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions // +k8s:defaulter-gen=TypeMeta // Package v1beta1 is the v1beta1 version of the API. diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/generated.pb.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.pb.go similarity index 86% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/generated.pb.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.pb.go index 1910bf5f970..62730056e34 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.pb.go @@ -15,14 +15,14 @@ limitations under the License. */ // Code generated by protoc-gen-gogo. -// source: k8s.io/kubernetes/vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/generated.proto +// source: k8s.io/kubernetes/vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto // DO NOT EDIT! /* Package v1beta1 is a generated protocol buffer package. It is generated from these files: - k8s.io/kubernetes/vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/generated.proto + k8s.io/kubernetes/vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto It has these top-level messages: CustomResourceDefinition @@ -91,12 +91,12 @@ func (*CustomResourceDefinitionStatus) Descriptor() ([]byte, []int) { } func init() { - proto.RegisterType((*CustomResourceDefinition)(nil), "k8s.io.kube_apiextensions_server.pkg.apis.apiextensions.v1beta1.CustomResourceDefinition") - proto.RegisterType((*CustomResourceDefinitionCondition)(nil), "k8s.io.kube_apiextensions_server.pkg.apis.apiextensions.v1beta1.CustomResourceDefinitionCondition") - proto.RegisterType((*CustomResourceDefinitionList)(nil), "k8s.io.kube_apiextensions_server.pkg.apis.apiextensions.v1beta1.CustomResourceDefinitionList") - proto.RegisterType((*CustomResourceDefinitionNames)(nil), "k8s.io.kube_apiextensions_server.pkg.apis.apiextensions.v1beta1.CustomResourceDefinitionNames") - proto.RegisterType((*CustomResourceDefinitionSpec)(nil), "k8s.io.kube_apiextensions_server.pkg.apis.apiextensions.v1beta1.CustomResourceDefinitionSpec") - proto.RegisterType((*CustomResourceDefinitionStatus)(nil), "k8s.io.kube_apiextensions_server.pkg.apis.apiextensions.v1beta1.CustomResourceDefinitionStatus") + proto.RegisterType((*CustomResourceDefinition)(nil), "k8s.io.apiextensions_apiserver.pkg.apis.apiextensions.v1beta1.CustomResourceDefinition") + proto.RegisterType((*CustomResourceDefinitionCondition)(nil), "k8s.io.apiextensions_apiserver.pkg.apis.apiextensions.v1beta1.CustomResourceDefinitionCondition") + proto.RegisterType((*CustomResourceDefinitionList)(nil), "k8s.io.apiextensions_apiserver.pkg.apis.apiextensions.v1beta1.CustomResourceDefinitionList") + proto.RegisterType((*CustomResourceDefinitionNames)(nil), "k8s.io.apiextensions_apiserver.pkg.apis.apiextensions.v1beta1.CustomResourceDefinitionNames") + proto.RegisterType((*CustomResourceDefinitionSpec)(nil), "k8s.io.apiextensions_apiserver.pkg.apis.apiextensions.v1beta1.CustomResourceDefinitionSpec") + proto.RegisterType((*CustomResourceDefinitionStatus)(nil), "k8s.io.apiextensions_apiserver.pkg.apis.apiextensions.v1beta1.CustomResourceDefinitionStatus") } func (m *CustomResourceDefinition) Marshal() (dAtA []byte, err error) { size := m.Size() @@ -1584,62 +1584,62 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/kubernetes/vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/kubernetes/vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ - // 847 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x4d, 0x6f, 0x23, 0x35, - 0x18, 0xce, 0xe4, 0xa3, 0x2d, 0x5e, 0xc2, 0x22, 0x4b, 0x48, 0xa3, 0x08, 0x26, 0xdd, 0x20, 0xd0, - 0x2e, 0xa2, 0x33, 0x74, 0x59, 0x10, 0x9c, 0x10, 0x59, 0x24, 0xb4, 0x62, 0x17, 0x90, 0xb3, 0x42, - 0x02, 0x01, 0xc5, 0x99, 0xbc, 0x9d, 0x98, 0x64, 0xec, 0x91, 0xed, 0x89, 0xe8, 0x05, 0x90, 0x38, - 0xf4, 0xca, 0x89, 0x0b, 0xff, 0x80, 0x5f, 0xd2, 0x63, 0x6f, 0x70, 0x8a, 0x68, 0xf8, 0x0b, 0x70, - 0xa9, 0x38, 0x20, 0x7b, 0x9c, 0x49, 0x42, 0x08, 0xad, 0x84, 0xc2, 0x6d, 0xfc, 0x7e, 0x3c, 0xcf, - 0xf3, 0x7e, 0xd8, 0x83, 0x86, 0xa3, 0x37, 0x54, 0xc8, 0x44, 0x34, 0xca, 0xfb, 0x20, 0x39, 0x68, - 0x50, 0xd1, 0x04, 0xf8, 0x40, 0xc8, 0x68, 0xc9, 0x71, 0x40, 0x33, 0x06, 0x5f, 0x69, 0xe0, 0x8a, - 0x09, 0xae, 0x0e, 0x14, 0xc8, 0x09, 0xc8, 0x28, 0x1b, 0x25, 0x11, 0xcd, 0x98, 0x8a, 0x56, 0xbc, - 0xd1, 0xe4, 0xb0, 0x0f, 0x9a, 0x1e, 0x46, 0x09, 0x70, 0x90, 0x54, 0xc3, 0x20, 0xcc, 0xa4, 0xd0, - 0x02, 0xbf, 0x55, 0x00, 0x86, 0x06, 0xf0, 0x68, 0x25, 0xe5, 0xa8, 0x00, 0x0c, 0xb3, 0x51, 0x12, - 0x1a, 0xc0, 0x70, 0xc5, 0x1b, 0x3a, 0xc0, 0xd6, 0x41, 0xc2, 0xf4, 0x30, 0xef, 0x87, 0xb1, 0x48, - 0xa3, 0x44, 0x24, 0x22, 0xb2, 0xb8, 0xfd, 0xfc, 0xd8, 0x9e, 0xec, 0xc1, 0x7e, 0x15, 0x7c, 0xad, - 0x7b, 0xae, 0x00, 0x9a, 0xb1, 0x94, 0xc6, 0x43, 0xc6, 0x41, 0x9e, 0x2c, 0x34, 0xa7, 0xa0, 0x69, - 0x34, 0x59, 0x53, 0xd9, 0x8a, 0x36, 0x65, 0xc9, 0x9c, 0x6b, 0x96, 0xc2, 0x5a, 0xc2, 0xeb, 0x57, - 0x25, 0xa8, 0x78, 0x08, 0x29, 0x5d, 0xcb, 0x7b, 0x75, 0x53, 0x5e, 0xae, 0xd9, 0x38, 0x62, 0x5c, - 0x2b, 0x2d, 0xff, 0x9e, 0xd4, 0x39, 0xad, 0x21, 0xff, 0x7e, 0xae, 0xb4, 0x48, 0x09, 0x28, 0x91, - 0xcb, 0x18, 0xde, 0x81, 0x63, 0xc6, 0x99, 0x66, 0x82, 0xe3, 0x2f, 0xd0, 0x9e, 0xa9, 0x6a, 0x40, - 0x35, 0xf5, 0xbd, 0x7d, 0xef, 0xf6, 0x8d, 0xbb, 0xaf, 0x84, 0xae, 0xe7, 0xcb, 0x24, 0x8b, 0x36, - 0x9b, 0xe8, 0x70, 0x72, 0x18, 0x7e, 0xd0, 0xff, 0x12, 0x62, 0xfd, 0x08, 0x34, 0xed, 0xe2, 0xb3, - 0x69, 0xbb, 0x32, 0x9b, 0xb6, 0xd1, 0xc2, 0x46, 0x4a, 0x54, 0xfc, 0x0d, 0xaa, 0xab, 0x0c, 0x62, - 0xbf, 0x6a, 0xd1, 0x3f, 0x0b, 0xff, 0xe3, 0x44, 0xc3, 0x4d, 0xa5, 0xf4, 0x32, 0x88, 0xbb, 0x4f, - 0x3a, 0x29, 0x75, 0x73, 0x22, 0x96, 0x18, 0x9f, 0x7a, 0x68, 0x47, 0x69, 0xaa, 0x73, 0xe5, 0xd7, - 0xac, 0x86, 0xa3, 0xed, 0x69, 0xb0, 0x34, 0xdd, 0xa7, 0x9c, 0x8a, 0x9d, 0xe2, 0x4c, 0x1c, 0x7d, - 0xe7, 0xf7, 0x2a, 0xba, 0xb5, 0x29, 0xf5, 0xbe, 0xe0, 0x83, 0x62, 0x24, 0x0f, 0x50, 0x5d, 0x9f, - 0x64, 0x60, 0xc7, 0xf1, 0x44, 0xf7, 0xb5, 0x79, 0x45, 0x8f, 0x4f, 0x32, 0xb8, 0x9c, 0xb6, 0x5f, - 0xb8, 0x12, 0xc0, 0x04, 0x12, 0x0b, 0x81, 0xdf, 0x2c, 0x2b, 0xaf, 0x5a, 0xb0, 0x5b, 0xab, 0xc2, - 0x2e, 0xa7, 0xed, 0x9b, 0x65, 0xda, 0xaa, 0x56, 0x3c, 0x41, 0x78, 0x4c, 0x95, 0x7e, 0x2c, 0x29, - 0x57, 0x05, 0x2c, 0x4b, 0xc1, 0x35, 0xf0, 0xa5, 0xeb, 0xad, 0x88, 0xc9, 0xe8, 0xb6, 0x1c, 0x25, - 0x7e, 0xb8, 0x86, 0x46, 0xfe, 0x81, 0x01, 0xbf, 0x88, 0x76, 0x24, 0x50, 0x25, 0xb8, 0x5f, 0xb7, - 0x92, 0xcb, 0x5e, 0x12, 0x6b, 0x25, 0xce, 0x8b, 0xef, 0xa0, 0xdd, 0x14, 0x94, 0xa2, 0x09, 0xf8, - 0x0d, 0x1b, 0x78, 0xd3, 0x05, 0xee, 0x3e, 0x2a, 0xcc, 0x64, 0xee, 0xef, 0xfc, 0xe9, 0xa1, 0x67, - 0x37, 0x75, 0xed, 0x21, 0x53, 0x1a, 0x7f, 0xba, 0x76, 0x09, 0xc2, 0xeb, 0x55, 0x68, 0xb2, 0xed, - 0x15, 0x78, 0xda, 0x91, 0xef, 0xcd, 0x2d, 0x4b, 0x17, 0xe0, 0x6b, 0xd4, 0x60, 0x1a, 0x52, 0x33, - 0x83, 0xda, 0xed, 0x1b, 0x77, 0x3f, 0xde, 0xda, 0xf6, 0x75, 0x9b, 0x4e, 0x45, 0xe3, 0x81, 0xe1, - 0x23, 0x05, 0x6d, 0xe7, 0x0f, 0x0f, 0x3d, 0xb7, 0x29, 0xe5, 0x7d, 0x9a, 0x82, 0x32, 0x3d, 0xcf, - 0xc6, 0xb9, 0xa4, 0x63, 0xb7, 0x73, 0x65, 0xcf, 0x3f, 0xb4, 0x56, 0xe2, 0xbc, 0xf8, 0x65, 0xb4, - 0xa7, 0x18, 0x4f, 0xf2, 0x31, 0x95, 0x6e, 0xa1, 0xca, 0xba, 0x7b, 0xce, 0x4e, 0xca, 0x08, 0x1c, - 0x22, 0xa4, 0x86, 0x42, 0x6a, 0xcb, 0xe1, 0xd7, 0xf6, 0x6b, 0x06, 0xd9, 0x3c, 0x13, 0xbd, 0xd2, - 0x4a, 0x96, 0x22, 0xf0, 0x3e, 0xaa, 0x8f, 0x18, 0x1f, 0xb8, 0xb9, 0x97, 0x37, 0xf9, 0x3d, 0xc6, - 0x07, 0xc4, 0x7a, 0x0c, 0xff, 0x98, 0x29, 0x6d, 0x2c, 0x6e, 0xe8, 0x2b, 0x7d, 0xb7, 0x91, 0x65, - 0x44, 0xe7, 0xa7, 0xea, 0xe6, 0xb1, 0x9b, 0xe7, 0x01, 0x3f, 0x8f, 0x1a, 0x89, 0x14, 0x79, 0xe6, - 0xaa, 0x2e, 0xbb, 0xf7, 0xae, 0x31, 0x92, 0xc2, 0x67, 0xf6, 0x6c, 0x02, 0xd2, 0x0c, 0xc0, 0x95, - 0x5c, 0xee, 0xd9, 0x47, 0x85, 0x99, 0xcc, 0xfd, 0xf8, 0x3b, 0x0f, 0x35, 0xb8, 0x2b, 0xd6, 0x2c, - 0xd1, 0xe7, 0x5b, 0x9b, 0xb4, 0x6d, 0xd8, 0x42, 0x70, 0xd1, 0xcb, 0x82, 0x1b, 0xdf, 0x43, 0x0d, - 0x15, 0x8b, 0x0c, 0x5c, 0x1f, 0x83, 0x79, 0x50, 0xcf, 0x18, 0x2f, 0xa7, 0xed, 0xe6, 0x1c, 0xce, - 0x1a, 0x48, 0x11, 0xdc, 0xf9, 0xb9, 0x8a, 0x82, 0x7f, 0x7f, 0xd5, 0xf0, 0x0f, 0x1e, 0x42, 0xf1, - 0xfc, 0xb5, 0x50, 0xbe, 0x67, 0xb7, 0xb9, 0xbf, 0xb5, 0x1a, 0xcb, 0x87, 0x69, 0xf1, 0x7f, 0x29, - 0x4d, 0x8a, 0x2c, 0x29, 0xc1, 0x3f, 0x7a, 0xa8, 0x49, 0xe3, 0x18, 0x32, 0x0d, 0x83, 0x62, 0xd9, - 0xaa, 0xff, 0x4b, 0xff, 0x9f, 0x71, 0xba, 0x9a, 0x6f, 0x2f, 0x93, 0x93, 0x55, 0x2d, 0xdd, 0x3b, - 0x67, 0x17, 0x41, 0xe5, 0xfc, 0x22, 0xa8, 0xfc, 0x72, 0x11, 0x54, 0xbe, 0x9d, 0x05, 0xde, 0xd9, - 0x2c, 0xf0, 0xce, 0x67, 0x81, 0xf7, 0xeb, 0x2c, 0xf0, 0xbe, 0xff, 0x2d, 0xa8, 0x7c, 0xb2, 0xeb, - 0xe8, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x24, 0xd3, 0x02, 0xf6, 0x58, 0x09, 0x00, 0x00, + // 842 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcf, 0x8b, 0x23, 0x45, + 0x14, 0x4e, 0xe7, 0xc7, 0xcc, 0x58, 0xeb, 0xb8, 0x52, 0x20, 0x34, 0x83, 0x76, 0x66, 0x23, 0xca, + 0xae, 0xb8, 0xdd, 0xce, 0xba, 0x8a, 0x1e, 0x3c, 0x98, 0x15, 0x64, 0x71, 0x57, 0xa5, 0xb2, 0x28, + 0xe8, 0x8a, 0x5b, 0xe9, 0xbc, 0xe9, 0x94, 0x49, 0x57, 0x35, 0x55, 0xd5, 0xc1, 0x01, 0x05, 0x45, + 0xbc, 0x7b, 0xf0, 0xe2, 0x7f, 0xe0, 0x9f, 0x32, 0xc7, 0x05, 0x2f, 0x9e, 0x82, 0x13, 0xff, 0x05, + 0xbd, 0xe4, 0x24, 0x55, 0x5d, 0xa9, 0x24, 0xc6, 0xb8, 0x0b, 0x12, 0x6f, 0xd3, 0xef, 0xc7, 0xf7, + 0x7d, 0xef, 0x7b, 0x2f, 0x35, 0xe8, 0x74, 0xf4, 0x86, 0x8a, 0x99, 0x48, 0x46, 0x65, 0x1f, 0x24, + 0x07, 0x0d, 0x2a, 0x99, 0x00, 0x1f, 0x08, 0x99, 0xb8, 0x04, 0x2d, 0x18, 0x7c, 0xa9, 0x81, 0x2b, + 0x26, 0xb8, 0xba, 0x4e, 0x0b, 0xa6, 0x40, 0x4e, 0x40, 0x26, 0xc5, 0x28, 0x33, 0x39, 0xb5, 0x5e, + 0x90, 0x4c, 0x4e, 0xfa, 0xa0, 0xe9, 0x49, 0x92, 0x01, 0x07, 0x49, 0x35, 0x0c, 0xe2, 0x42, 0x0a, + 0x2d, 0xf0, 0x5b, 0x15, 0x5c, 0xbc, 0x56, 0xfd, 0xb9, 0x87, 0x8b, 0x8b, 0x51, 0x66, 0x72, 0x6a, + 0xbd, 0x20, 0x76, 0x70, 0x47, 0xd7, 0x33, 0xa6, 0x87, 0x65, 0x3f, 0x4e, 0x45, 0x9e, 0x64, 0x22, + 0x13, 0x89, 0x45, 0xed, 0x97, 0xa7, 0xf6, 0xcb, 0x7e, 0xd8, 0xbf, 0x2a, 0xb6, 0xa3, 0x9b, 0x4b, + 0xf1, 0x39, 0x4d, 0x87, 0x8c, 0x83, 0x3c, 0x5b, 0x2a, 0xce, 0x41, 0xd3, 0x64, 0xb2, 0xa1, 0xf1, + 0x28, 0xd9, 0xd6, 0x25, 0x4b, 0xae, 0x59, 0x0e, 0x1b, 0x0d, 0xaf, 0x3f, 0xaa, 0x41, 0xa5, 0x43, + 0xc8, 0xe9, 0x46, 0xdf, 0xab, 0xdb, 0xfa, 0x4a, 0xcd, 0xc6, 0x09, 0xe3, 0x5a, 0x69, 0xf9, 0xf7, + 0xa6, 0xce, 0x77, 0x0d, 0x14, 0xde, 0x2a, 0x95, 0x16, 0x39, 0x01, 0x25, 0x4a, 0x99, 0xc2, 0x3b, + 0x70, 0xca, 0x38, 0xd3, 0x4c, 0x70, 0xfc, 0x00, 0x1d, 0x98, 0xa9, 0x06, 0x54, 0xd3, 0x30, 0x38, + 0x0e, 0xae, 0x5e, 0xba, 0xf1, 0x4a, 0xbc, 0x74, 0xdc, 0x93, 0x2c, 0x6d, 0x36, 0xd5, 0xf1, 0xe4, + 0x24, 0xfe, 0xa0, 0xff, 0x05, 0xa4, 0xfa, 0x2e, 0x68, 0xda, 0xc5, 0xe7, 0xd3, 0x76, 0x6d, 0x36, + 0x6d, 0xa3, 0x65, 0x8c, 0x78, 0x54, 0xfc, 0x35, 0x6a, 0xaa, 0x02, 0xd2, 0xb0, 0x6e, 0xd1, 0x3f, + 0x8d, 0xff, 0xd3, 0x3e, 0xe3, 0x6d, 0x83, 0xf4, 0x0a, 0x48, 0xbb, 0x4f, 0x3a, 0x21, 0x4d, 0xf3, + 0x45, 0x2c, 0x2d, 0xfe, 0x3e, 0x40, 0x7b, 0x4a, 0x53, 0x5d, 0xaa, 0xb0, 0x61, 0x15, 0x7c, 0xb6, + 0x2b, 0x05, 0x96, 0xa4, 0xfb, 0x94, 0xd3, 0xb0, 0x57, 0x7d, 0x13, 0x47, 0xde, 0xf9, 0xa3, 0x8e, + 0xae, 0x6c, 0x6b, 0xbd, 0x25, 0xf8, 0xa0, 0x5a, 0xc7, 0x6d, 0xd4, 0xd4, 0x67, 0x05, 0xd8, 0x55, + 0x3c, 0xd1, 0x7d, 0x6d, 0x31, 0xcf, 0xbd, 0xb3, 0x02, 0xe6, 0xd3, 0xf6, 0x0b, 0x8f, 0x04, 0x30, + 0x85, 0xc4, 0x42, 0xe0, 0x37, 0xfd, 0xdc, 0x75, 0x0b, 0x76, 0x65, 0x5d, 0xd8, 0x7c, 0xda, 0xbe, + 0xec, 0xdb, 0xd6, 0xb5, 0xe2, 0x09, 0xc2, 0x63, 0xaa, 0xf4, 0x3d, 0x49, 0xb9, 0xaa, 0x60, 0x59, + 0x0e, 0xce, 0xbe, 0x97, 0x1e, 0xef, 0x3c, 0x4c, 0x47, 0xf7, 0xc8, 0x51, 0xe2, 0x3b, 0x1b, 0x68, + 0xe4, 0x1f, 0x18, 0xf0, 0x8b, 0x68, 0x4f, 0x02, 0x55, 0x82, 0x87, 0x4d, 0x2b, 0xd9, 0x7b, 0x49, + 0x6c, 0x94, 0xb8, 0x2c, 0xbe, 0x86, 0xf6, 0x73, 0x50, 0x8a, 0x66, 0x10, 0xb6, 0x6c, 0xe1, 0x65, + 0x57, 0xb8, 0x7f, 0xb7, 0x0a, 0x93, 0x45, 0xbe, 0x33, 0x0f, 0xd0, 0xb3, 0xdb, 0x5c, 0xbb, 0xc3, + 0x94, 0xc6, 0xf7, 0x37, 0x7e, 0x00, 0xf1, 0xe3, 0x4d, 0x68, 0xba, 0xed, 0xf9, 0x3f, 0xed, 0xc8, + 0x0f, 0x16, 0x91, 0x95, 0xe3, 0xff, 0x0a, 0xb5, 0x98, 0x86, 0xdc, 0xec, 0xa0, 0x71, 0xf5, 0xd2, + 0x8d, 0x8f, 0x77, 0x74, 0x7b, 0xdd, 0x43, 0xa7, 0xa1, 0x75, 0xdb, 0xb0, 0x91, 0x8a, 0xb4, 0xf3, + 0x67, 0x80, 0x9e, 0xdb, 0xd6, 0xf2, 0x3e, 0xcd, 0x41, 0x19, 0xc7, 0x8b, 0x71, 0x29, 0xe9, 0xd8, + 0x5d, 0x9c, 0x77, 0xfc, 0x43, 0x1b, 0x25, 0x2e, 0x8b, 0x5f, 0x46, 0x07, 0x8a, 0xf1, 0xac, 0x1c, + 0x53, 0xe9, 0xce, 0xc9, 0x4f, 0xdd, 0x73, 0x71, 0xe2, 0x2b, 0x70, 0x8c, 0x90, 0x1a, 0x0a, 0xa9, + 0x2d, 0x47, 0xd8, 0x38, 0x6e, 0x18, 0x64, 0xf3, 0x40, 0xf4, 0x7c, 0x94, 0xac, 0x54, 0xe0, 0x63, + 0xd4, 0x1c, 0x31, 0x3e, 0x70, 0x5b, 0xf7, 0xbf, 0xe2, 0xf7, 0x18, 0x1f, 0x10, 0x9b, 0x31, 0xfc, + 0x63, 0xa6, 0xb4, 0x89, 0xb8, 0x95, 0xaf, 0xb9, 0x6e, 0x2b, 0x7d, 0x45, 0xe7, 0xe7, 0xfa, 0xf6, + 0xa5, 0x9b, 0xa7, 0x01, 0x3f, 0x8f, 0x5a, 0x99, 0x14, 0x65, 0xe1, 0xa6, 0xf6, 0xee, 0xbd, 0x6b, + 0x82, 0xa4, 0xca, 0x99, 0x2b, 0x9b, 0x80, 0x34, 0x0b, 0x70, 0x23, 0xfb, 0x2b, 0xfb, 0xa8, 0x0a, + 0x93, 0x45, 0x1e, 0x7f, 0x1b, 0xa0, 0x16, 0x77, 0xc3, 0x9a, 0x13, 0xba, 0xbf, 0xa3, 0x3d, 0x5b, + 0xbb, 0x96, 0x72, 0x2b, 0x27, 0x2b, 0x66, 0x7c, 0x13, 0xb5, 0x54, 0x2a, 0x0a, 0x70, 0x2e, 0x46, + 0x8b, 0xa2, 0x9e, 0x09, 0xce, 0xa7, 0xed, 0xc3, 0x05, 0x9c, 0x0d, 0x90, 0xaa, 0xb8, 0xf3, 0x4b, + 0x1d, 0x45, 0xff, 0xfe, 0xa2, 0xe1, 0x1f, 0x03, 0x84, 0xd2, 0xc5, 0x4b, 0xa1, 0xc2, 0xc0, 0x5e, + 0xf2, 0x83, 0x1d, 0x4d, 0xe8, 0x9f, 0xa4, 0xe5, 0x7f, 0x15, 0x1f, 0x52, 0x64, 0x45, 0x07, 0xfe, + 0x29, 0x40, 0x87, 0x34, 0x4d, 0xa1, 0xd0, 0x30, 0xa8, 0x0e, 0xad, 0xfe, 0x3f, 0x78, 0xff, 0x8c, + 0x53, 0x75, 0xf8, 0xf6, 0x2a, 0x35, 0x59, 0x57, 0xd2, 0xbd, 0x76, 0x7e, 0x11, 0xd5, 0x1e, 0x5e, + 0x44, 0xb5, 0x5f, 0x2f, 0xa2, 0xda, 0x37, 0xb3, 0x28, 0x38, 0x9f, 0x45, 0xc1, 0xc3, 0x59, 0x14, + 0xfc, 0x36, 0x8b, 0x82, 0x1f, 0x7e, 0x8f, 0x6a, 0x9f, 0xec, 0x3b, 0xba, 0xbf, 0x02, 0x00, 0x00, + 0xff, 0xff, 0x58, 0x14, 0x04, 0xe3, 0x48, 0x09, 0x00, 0x00, } diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/generated.proto b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto similarity index 98% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/generated.proto rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto index 0cd83d70271..d6e0ab94323 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/generated.proto +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto @@ -19,7 +19,7 @@ limitations under the License. syntax = 'proto2'; -package k8s.io.kube_apiextensions_server.pkg.apis.apiextensions.v1beta1; +package k8s.io.apiextensions_apiserver.pkg.apis.apiextensions.v1beta1; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/generated.proto"; diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/register.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/register.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/register.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/register.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/types.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/types.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/types.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/types.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/zz_generated.conversion.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/zz_generated.conversion.go similarity index 99% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/zz_generated.conversion.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/zz_generated.conversion.go index 137523f391d..8b4083f5d60 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/zz_generated.conversion.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/zz_generated.conversion.go @@ -21,9 +21,9 @@ limitations under the License. package v1beta1 import ( + apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - apiextensions "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/zz_generated.deepcopy.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/zz_generated.deepcopy.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/zz_generated.deepcopy.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/zz_generated.defaults.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/zz_generated.defaults.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/zz_generated.defaults.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/zz_generated.defaults.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/validation/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/BUILD similarity index 81% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/validation/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/BUILD index 286f8c18f78..b91ec6ac792 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/validation/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/BUILD @@ -13,10 +13,10 @@ go_library( srcs = ["validation.go"], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/validation:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/validation:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", ], ) @@ -26,8 +26,8 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/validation/validation.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go similarity index 99% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/validation/validation.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go index e0ef856bc97..6623b0478a8 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/validation/validation.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go @@ -20,10 +20,10 @@ import ( "fmt" "strings" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" genericvalidation "k8s.io/apimachinery/pkg/api/validation" validationutil "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" ) // ValidateCustomResourceDefinition statically validates diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/validation/validation_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation_test.go similarity index 99% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/validation/validation_test.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation_test.go index 642d0a87138..dd712c94f40 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/validation/validation_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation_test.go @@ -19,9 +19,9 @@ package validation import ( "testing" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation/field" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" ) type validationMatch struct { diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/zz_generated.deepcopy.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/zz_generated.deepcopy.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/zz_generated.deepcopy.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/zz_generated.deepcopy.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/BUILD similarity index 64% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/BUILD index 41702b8e5b6..20a8d2d02b2 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/BUILD @@ -18,6 +18,19 @@ go_library( tags = ["automanaged"], deps = [ "//vendor/github.com/golang/glog:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/controller/finalizer:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/controller/status:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/registry/customresource:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library", @@ -45,18 +58,5 @@ go_library( "//vendor/k8s.io/client-go/discovery:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", "//vendor/k8s.io/client-go/util/workqueue:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/controller/finalizer:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/controller/status:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/registry/customresource:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/registry/customresourcedefinition:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/apiserver.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go similarity index 88% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/apiserver.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go index 5c8d1799ce5..8dfe59e105c 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/apiserver.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go @@ -36,19 +36,19 @@ import ( "k8s.io/apiserver/pkg/registry/rest" genericapiserver "k8s.io/apiserver/pkg/server" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" - "k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset" - internalinformers "k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion" - "k8s.io/kube-apiextensions-server/pkg/controller/finalizer" - "k8s.io/kube-apiextensions-server/pkg/controller/status" - "k8s.io/kube-apiextensions-server/pkg/registry/customresourcedefinition" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + "k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset" + internalinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion" + "k8s.io/apiextensions-apiserver/pkg/controller/finalizer" + "k8s.io/apiextensions-apiserver/pkg/controller/status" + "k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition" // make sure the generated client works - _ "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset" - _ "k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions" - _ "k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion" + _ "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" + _ "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions" + _ "k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion" ) var ( @@ -111,7 +111,7 @@ func (c *Config) SkipComplete() completedConfig { // New returns a new instance of CustomResourceDefinitions from the given config. func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget) (*CustomResourceDefinitions, error) { - genericServer, err := c.Config.GenericConfig.SkipComplete().New("kube-apiextensions-server", delegationTarget) // completion is done in Complete, no need for a second time + genericServer, err := c.Config.GenericConfig.SkipComplete().New("apiextensions-apiserver", delegationTarget) // completion is done in Complete, no need for a second time if err != nil { return nil, err } diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/customresource_discovery.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/customresource_discovery.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/customresource_discovery_controller.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go similarity index 96% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/customresource_discovery_controller.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go index 51271fcba12..85a2a27d097 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/customresource_discovery_controller.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go @@ -32,9 +32,9 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" - informers "k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion" - listers "k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" + informers "k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion" + listers "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion" ) type DiscoveryController struct { diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/customresource_handler.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go similarity index 97% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/customresource_handler.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go index 9c82edd09b6..2ba73858ba4 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/customresource_handler.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go @@ -43,10 +43,10 @@ import ( "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/client-go/discovery" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" - listers "k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion" - "k8s.io/kube-apiextensions-server/pkg/controller/finalizer" - "k8s.io/kube-apiextensions-server/pkg/registry/customresource" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" + listers "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion" + "k8s.io/apiextensions-apiserver/pkg/controller/finalizer" + "k8s.io/apiextensions-apiserver/pkg/registry/customresource" ) // crdHandler serves the `/apis` endpoint. diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/BUILD similarity index 81% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/BUILD index 2c05f71234c..506e1f80d4f 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/BUILD @@ -16,9 +16,9 @@ go_library( tags = ["automanaged"], deps = [ "//vendor/github.com/golang/glog:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1:go_default_library", "//vendor/k8s.io/client-go/discovery:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/clientset.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/clientset.go similarity index 96% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/clientset.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/clientset.go index 7a2f136c15d..634e79a7111 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/clientset.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/clientset.go @@ -18,10 +18,10 @@ package clientset import ( glog "github.com/golang/glog" + apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" - apiextensionsv1beta1 "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" ) type Interface interface { diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/doc.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/doc.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/doc.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/BUILD similarity index 65% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/BUILD index 3e999e1d64f..865adf9e565 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/BUILD @@ -16,6 +16,10 @@ go_library( ], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake: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/apimachinery/pkg/runtime/schema:go_default_library", @@ -24,9 +28,5 @@ go_library( "//vendor/k8s.io/client-go/discovery:go_default_library", "//vendor/k8s.io/client-go/discovery/fake:go_default_library", "//vendor/k8s.io/client-go/testing:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/clientset_generated.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/clientset_generated.go similarity index 88% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/clientset_generated.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/clientset_generated.go index ef5a1d86077..84d77409b6c 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/clientset_generated.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/clientset_generated.go @@ -17,14 +17,14 @@ limitations under the License. package fake import ( + clientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" + apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" + fakeapiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" - clientset "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset" - apiextensionsv1beta1 "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" - fakeapiextensionsv1beta1 "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/doc.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/doc.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/doc.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/register.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/register.go similarity index 95% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/register.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/register.go index d31cd113b68..857e10e624c 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/register.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/register.go @@ -17,11 +17,11 @@ limitations under the License. package fake import ( + apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" - apiextensionsv1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" ) var scheme = runtime.NewScheme() diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/BUILD similarity index 85% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/BUILD index 240a4292e66..bac733cbc97 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/BUILD @@ -15,10 +15,10 @@ go_library( ], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1: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/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/doc.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/doc.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/doc.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/register.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/register.go similarity index 95% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/register.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/register.go index f0688a15171..95f4bb41ab0 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/register.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/register.go @@ -17,11 +17,11 @@ limitations under the License. package scheme import ( + apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" - apiextensionsv1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" ) var Scheme = runtime.NewScheme() diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/BUILD similarity index 77% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/BUILD index 7bd7069dea4..074d54e3abd 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/BUILD @@ -17,12 +17,12 @@ go_library( ], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/apiextensions_client.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/apiextensions_client.go similarity index 94% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/apiextensions_client.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/apiextensions_client.go index 8799838be22..6a15dadd7b9 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/apiextensions_client.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/apiextensions_client.go @@ -17,10 +17,10 @@ limitations under the License. package v1beta1 import ( + v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" - "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme" ) type ApiextensionsV1beta1Interface interface { diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go similarity index 97% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go index 00cfe919d8b..bfc11155d6d 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go @@ -17,12 +17,12 @@ limitations under the License. package v1beta1 import ( + v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + scheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" - scheme "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme" ) // CustomResourceDefinitionsGetter has a method to return a CustomResourceDefinitionInterface. diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/doc.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/doc.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/doc.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/BUILD similarity index 78% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/BUILD index ab772e05965..b2b91972fac 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/BUILD @@ -16,6 +16,8 @@ go_library( ], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", @@ -23,7 +25,5 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/testing:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/doc.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/doc.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/doc.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_apiextensions_client.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_apiextensions_client.go similarity index 91% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_apiextensions_client.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_apiextensions_client.go index 38d09f1805c..252845f99ff 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_apiextensions_client.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_apiextensions_client.go @@ -17,9 +17,9 @@ limitations under the License. package fake import ( + v1beta1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" ) type FakeApiextensionsV1beta1 struct { diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_customresourcedefinition.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_customresourcedefinition.go similarity index 98% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_customresourcedefinition.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_customresourcedefinition.go index 5dc54244937..16d128d4ee3 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_customresourcedefinition.go @@ -17,13 +17,13 @@ limitations under the License. package fake import ( + v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" ) // FakeCustomResourceDefinitions implements CustomResourceDefinitionInterface diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/generated_expansion.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/generated_expansion.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/generated_expansion.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/generated_expansion.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/BUILD similarity index 79% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/BUILD index ef56afd483e..7303fc1c7e6 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/BUILD @@ -16,9 +16,9 @@ go_library( tags = ["automanaged"], deps = [ "//vendor/github.com/golang/glog:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion:go_default_library", "//vendor/k8s.io/client-go/discovery:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/clientset.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/clientset.go similarity index 95% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/clientset.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/clientset.go index f30616797fa..77172f598cf 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/clientset.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/clientset.go @@ -18,10 +18,10 @@ package internalclientset import ( glog "github.com/golang/glog" + apiextensionsinternalversion "k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" - apiextensionsinternalversion "k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion" ) type Interface interface { diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/doc.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/doc.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/doc.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/fake/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/BUILD similarity index 64% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/fake/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/BUILD index 67215dc6e31..69efc3ceaf4 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/fake/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/BUILD @@ -16,6 +16,10 @@ go_library( ], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake: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/apimachinery/pkg/runtime/schema:go_default_library", @@ -24,9 +28,5 @@ go_library( "//vendor/k8s.io/client-go/discovery:go_default_library", "//vendor/k8s.io/client-go/discovery/fake:go_default_library", "//vendor/k8s.io/client-go/testing:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/fake/clientset_generated.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/clientset_generated.go similarity index 85% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/fake/clientset_generated.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/clientset_generated.go index 196c41006ed..7b798eff614 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/fake/clientset_generated.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/clientset_generated.go @@ -17,14 +17,14 @@ limitations under the License. package fake import ( + clientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset" + apiextensionsinternalversion "k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion" + fakeapiextensionsinternalversion "k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" - clientset "k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset" - apiextensionsinternalversion "k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion" - fakeapiextensionsinternalversion "k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/fake/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/doc.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/fake/doc.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/doc.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/fake/register.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/register.go similarity index 95% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/fake/register.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/register.go index 185c70f2037..1ebf1f9d071 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/fake/register.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/register.go @@ -17,11 +17,11 @@ limitations under the License. package fake import ( + apiextensionsinternalversion "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" - apiextensionsinternalversion "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" ) var scheme = runtime.NewScheme() diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/scheme/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/scheme/BUILD similarity index 88% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/scheme/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/scheme/BUILD index d368bd4a1f1..7ad7f782c71 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/scheme/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/scheme/BUILD @@ -15,12 +15,12 @@ go_library( ], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered: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/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/scheme/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/scheme/doc.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/scheme/doc.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/scheme/doc.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/scheme/register.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/scheme/register.go similarity index 95% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/scheme/register.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/scheme/register.go index b71491fd042..92e65a67dc8 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/scheme/register.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/scheme/register.go @@ -17,13 +17,13 @@ limitations under the License. package scheme import ( + apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install" announced "k8s.io/apimachinery/pkg/apimachinery/announced" registered "k8s.io/apimachinery/pkg/apimachinery/registered" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" - apiextensions "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install" os "os" ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/BUILD similarity index 75% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/BUILD index 84f3a99299c..3eb2b583158 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/BUILD @@ -17,11 +17,11 @@ go_library( ], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/scheme:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/scheme:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/apiextensions_client.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/apiextensions_client.go similarity index 96% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/apiextensions_client.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/apiextensions_client.go index 6172593c150..28890867903 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/apiextensions_client.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/apiextensions_client.go @@ -17,8 +17,8 @@ limitations under the License. package internalversion import ( + "k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/scheme" rest "k8s.io/client-go/rest" - "k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/scheme" ) type ApiextensionsInterface interface { diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/customresourcedefinition.go similarity index 97% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/customresourcedefinition.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/customresourcedefinition.go index f2dcacb64e0..fbd862cff3f 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/customresourcedefinition.go @@ -17,12 +17,12 @@ limitations under the License. package internalversion import ( + apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" + scheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - apiextensions "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" - scheme "k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/scheme" ) // CustomResourceDefinitionsGetter has a method to return a CustomResourceDefinitionInterface. diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/doc.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/doc.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/doc.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/BUILD similarity index 77% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/BUILD index 070c4458f5f..9978eb4c81e 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/BUILD @@ -16,6 +16,8 @@ go_library( ], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", @@ -23,7 +25,5 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/testing:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/doc.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/doc.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/doc.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/fake_apiextensions_client.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/fake_apiextensions_client.go similarity index 89% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/fake_apiextensions_client.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/fake_apiextensions_client.go index 44d2629baf7..e90e8c6b45a 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/fake_apiextensions_client.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/fake_apiextensions_client.go @@ -17,9 +17,9 @@ limitations under the License. package fake import ( + internalversion "k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - internalversion "k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion" ) type FakeApiextensions struct { diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/fake_customresourcedefinition.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/fake_customresourcedefinition.go similarity index 98% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/fake_customresourcedefinition.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/fake_customresourcedefinition.go index 3194245a3dd..fc7371b642b 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/fake_customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/fake_customresourcedefinition.go @@ -17,13 +17,13 @@ limitations under the License. package fake import ( + apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - apiextensions "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" ) // FakeCustomResourceDefinitions implements CustomResourceDefinitionInterface diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/generated_expansion.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/generated_expansion.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/generated_expansion.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/generated_expansion.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/BUILD similarity index 53% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/BUILD index 014b58ba451..2767e73d2bf 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/BUILD @@ -15,12 +15,12 @@ go_library( ], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/internalinterfaces:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/BUILD similarity index 50% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/BUILD index c544036fc6f..5923e7103a5 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/BUILD @@ -12,7 +12,7 @@ go_library( srcs = ["interface.go"], tags = ["automanaged"], deps = [ - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1beta1:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/interface.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/interface.go similarity index 84% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/interface.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/interface.go index bbf5807f671..de7f6e34e65 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/interface.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/interface.go @@ -19,8 +19,8 @@ limitations under the License. package apiextensions import ( - v1beta1 "k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1" - internalinterfaces "k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces" + v1beta1 "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1beta1" + internalinterfaces "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1beta1/BUILD similarity index 57% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1beta1/BUILD index bd12cd1c3e2..494cad8c9bc 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1beta1/BUILD @@ -15,13 +15,13 @@ go_library( ], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1: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/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1beta1/customresourcedefinition.go similarity index 86% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1/customresourcedefinition.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1beta1/customresourcedefinition.go index c89e6792130..5669357225c 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1beta1/customresourcedefinition.go @@ -19,14 +19,14 @@ limitations under the License. package v1beta1 import ( + apiextensions_v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + clientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" + internalinterfaces "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces" + v1beta1 "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - apiextensions_v1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" - clientset "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset" - internalinterfaces "k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces" - v1beta1 "k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1" time "time" ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1/interface.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1beta1/interface.go similarity index 92% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1/interface.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1beta1/interface.go index 51feb60cd7f..cada14028b4 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1/interface.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1beta1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1beta1 import ( - internalinterfaces "k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/factory.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/factory.go similarity index 92% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/factory.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/factory.go index bee98db85c2..0f94a664d92 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/factory.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/factory.go @@ -19,12 +19,12 @@ limitations under the License. package externalversions import ( + clientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" + apiextensions "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions" + internalinterfaces "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - clientset "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset" - apiextensions "k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions" - internalinterfaces "k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces" reflect "reflect" sync "sync" time "time" diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/generic.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/generic.go similarity index 96% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/generic.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/generic.go index d15a507ccba..06abdaa9de0 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/generic.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/generic.go @@ -20,9 +20,9 @@ package externalversions import ( "fmt" + v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces/BUILD similarity index 80% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces/BUILD index ffc4d79c482..63fbd9dd606 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces/BUILD @@ -12,8 +12,8 @@ go_library( srcs = ["factory_interfaces.go"], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 93% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 35ecd8f5b92..6f7b0a81069 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -19,9 +19,9 @@ limitations under the License. package internalinterfaces import ( + clientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" - clientset "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset" time "time" ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/BUILD similarity index 53% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/BUILD index e170c6b7544..a9000ecae6a 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/BUILD @@ -15,12 +15,12 @@ go_library( ], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/internalinterfaces:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces:go_default_library", ], ) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/BUILD new file mode 100644 index 00000000000..68e3f915d44 --- /dev/null +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/BUILD @@ -0,0 +1,18 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_library", +) + +go_library( + name = "go_default_library", + srcs = ["interface.go"], + tags = ["automanaged"], + deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/internalinterfaces:go_default_library", + ], +) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/interface.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/interface.go similarity index 84% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/interface.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/interface.go index 3753bc072d8..8137e94b71e 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/interface.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/interface.go @@ -19,8 +19,8 @@ limitations under the License. package apiextensions import ( - internalversion "k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion" - internalinterfaces "k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/internalinterfaces" + internalversion "k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion" + internalinterfaces "k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion/BUILD similarity index 57% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion/BUILD index 1001ebb22a0..cedd60d922b 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion/BUILD @@ -15,13 +15,13 @@ go_library( ], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/internalinterfaces:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion: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/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/internalinterfaces:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion/customresourcedefinition.go similarity index 85% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion/customresourcedefinition.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion/customresourcedefinition.go index 99fae07188e..18a9592849c 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion/customresourcedefinition.go @@ -19,14 +19,14 @@ limitations under the License. package internalversion import ( + apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" + internalclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset" + internalinterfaces "k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/internalinterfaces" + internalversion "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - apiextensions "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" - internalclientset "k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset" - internalinterfaces "k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/internalinterfaces" - internalversion "k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion" time "time" ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion/interface.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion/interface.go similarity index 92% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion/interface.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion/interface.go index e9a0ae5f8ae..e9ba1c90a2e 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion/interface.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion/interface.go @@ -19,7 +19,7 @@ limitations under the License. package internalversion import ( - internalinterfaces "k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/internalinterfaces" + internalinterfaces "k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/factory.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/factory.go similarity index 92% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/factory.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/factory.go index 5da778d39ff..fc5fda9fc48 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/factory.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/factory.go @@ -19,12 +19,12 @@ limitations under the License. package internalversion import ( + internalclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset" + apiextensions "k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions" + internalinterfaces "k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/internalinterfaces" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - internalclientset "k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset" - apiextensions "k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions" - internalinterfaces "k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/internalinterfaces" reflect "reflect" sync "sync" time "time" diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/generic.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/generic.go similarity index 96% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/generic.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/generic.go index 8cf3811aca3..a338c57c539 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/generic.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/generic.go @@ -20,9 +20,9 @@ package internalversion import ( "fmt" + apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - apiextensions "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/internalinterfaces/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/internalinterfaces/BUILD similarity index 78% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/internalinterfaces/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/internalinterfaces/BUILD index ab17dc10c5d..7bcbb07c9f0 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/internalinterfaces/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/internalinterfaces/BUILD @@ -12,8 +12,8 @@ go_library( srcs = ["factory_interfaces.go"], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/internalinterfaces/factory_interfaces.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/internalinterfaces/factory_interfaces.go similarity index 92% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/internalinterfaces/factory_interfaces.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/internalinterfaces/factory_interfaces.go index 73e299a4da8..395b69ff897 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/internalinterfaces/factory_interfaces.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/internalinterfaces/factory_interfaces.go @@ -19,9 +19,9 @@ limitations under the License. package internalinterfaces import ( + internalclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" - internalclientset "k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset" time "time" ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion/BUILD similarity index 86% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion/BUILD index 821442f10fb..076880a7d0c 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion/BUILD @@ -15,10 +15,10 @@ go_library( ], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions: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/labels:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion/customresourcedefinition.go similarity index 97% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion/customresourcedefinition.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion/customresourcedefinition.go index 72b26cc3ec3..27bb4cad884 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion/customresourcedefinition.go @@ -19,11 +19,11 @@ limitations under the License. package internalversion import ( + apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - apiextensions "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" ) // CustomResourceDefinitionLister helps list CustomResourceDefinitions. diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion/expansion_generated.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion/expansion_generated.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion/expansion_generated.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion/expansion_generated.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1/BUILD similarity index 85% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1/BUILD index a87a9177c45..fcca3d57287 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1/BUILD @@ -15,10 +15,10 @@ go_library( ], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1: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/labels:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1/customresourcedefinition.go similarity index 97% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1/customresourcedefinition.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1/customresourcedefinition.go index f069276d167..f9b2a8f1e4b 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1/customresourcedefinition.go @@ -19,11 +19,11 @@ limitations under the License. package v1beta1 import ( + v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" ) // CustomResourceDefinitionLister helps list CustomResourceDefinitions. diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1/expansion_generated.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1/expansion_generated.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1/expansion_generated.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1/expansion_generated.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/cmd/server/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/BUILD similarity index 76% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/cmd/server/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/BUILD index 27ea2d571e1..a03eda540d9 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/cmd/server/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/BUILD @@ -13,11 +13,11 @@ go_library( tags = ["automanaged"], deps = [ "//vendor/github.com/spf13/cobra:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apiserver:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", "//vendor/k8s.io/apiserver/pkg/server:go_default_library", "//vendor/k8s.io/apiserver/pkg/server/options:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apiserver:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/cmd/server/start.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/start.go similarity index 97% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/cmd/server/start.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/start.go index 6b76aeb4cde..a54bcd4c058 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/cmd/server/start.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/start.go @@ -23,12 +23,12 @@ import ( "github.com/spf13/cobra" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + "k8s.io/apiextensions-apiserver/pkg/apiserver" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" genericregistry "k8s.io/apiserver/pkg/registry/generic" genericapiserver "k8s.io/apiserver/pkg/server" genericoptions "k8s.io/apiserver/pkg/server/options" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" - "k8s.io/kube-apiextensions-server/pkg/apiserver" ) const defaultEtcdPathPrefix = "/registry/apiextensions.kubernetes.io" diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/controller/finalizer/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/finalizer/BUILD similarity index 70% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/controller/finalizer/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/controller/finalizer/BUILD index a86a7d1d84c..7d19a58f205 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/controller/finalizer/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/finalizer/BUILD @@ -13,6 +13,10 @@ go_library( tags = ["automanaged"], deps = [ "//vendor/github.com/golang/glog:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", @@ -25,9 +29,5 @@ go_library( "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", "//vendor/k8s.io/client-go/util/workqueue:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/controller/finalizer/crd_finalizer.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/finalizer/crd_finalizer.go similarity index 96% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/controller/finalizer/crd_finalizer.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/controller/finalizer/crd_finalizer.go index ef9d33896b7..5974f7e5cd3 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/controller/finalizer/crd_finalizer.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/finalizer/crd_finalizer.go @@ -36,10 +36,10 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" - client "k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion" - informers "k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion" - listers "k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" + client "k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion" + informers "k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion" + listers "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion" ) var cloner = conversion.NewCloner() diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/controller/status/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status/BUILD similarity index 66% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/controller/status/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status/BUILD index 9123b5934e3..3afbfa81961 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/controller/status/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status/BUILD @@ -14,10 +14,10 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion:go_default_library", ], ) @@ -27,6 +27,10 @@ go_library( tags = ["automanaged"], deps = [ "//vendor/github.com/golang/glog:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion: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/conversion:go_default_library", @@ -37,9 +41,5 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", "//vendor/k8s.io/client-go/util/workqueue:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/controller/status/naming_controller.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status/naming_controller.go similarity index 97% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/controller/status/naming_controller.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status/naming_controller.go index 45053878f99..7dbb10307dc 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/controller/status/naming_controller.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status/naming_controller.go @@ -35,10 +35,10 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" - client "k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion" - informers "k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion" - listers "k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" + client "k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion" + informers "k8s.io/apiextensions-apiserver/pkg/client/informers/internalversion/apiextensions/internalversion" + listers "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion" ) var cloner = conversion.NewCloner() diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/controller/status/naming_controller_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status/naming_controller_test.go similarity index 99% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/controller/status/naming_controller_test.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status/naming_controller_test.go index e9a7627758f..615c5dd85ff 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/controller/status/naming_controller_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status/naming_controller_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" + listers "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/cache" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" - listers "k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion" ) type crdBuilder struct { diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresource/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/BUILD similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresource/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/BUILD diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresource/etcd.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/etcd.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresource/etcd.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/etcd.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresource/strategy.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/strategy.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresource/strategy.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/strategy.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresourcedefinition/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition/BUILD similarity index 86% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresourcedefinition/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition/BUILD index 59f4a682cc5..bc8a384a2dc 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresourcedefinition/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition/BUILD @@ -15,6 +15,8 @@ go_library( ], tags = ["automanaged"], deps = [ + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation: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/fields:go_default_library", @@ -28,7 +30,5 @@ go_library( "//vendor/k8s.io/apiserver/pkg/storage:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/errors:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/names:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/validation:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresourcedefinition/etcd.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition/etcd.go similarity index 99% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresourcedefinition/etcd.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition/etcd.go index efaf41e95d6..f300dac285d 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresourcedefinition/etcd.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition/etcd.go @@ -19,6 +19,7 @@ package customresourcedefinition import ( "fmt" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -28,7 +29,6 @@ import ( "k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/storage" storageerr "k8s.io/apiserver/pkg/storage/errors" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" ) // rest implements a RESTStorage for API services against etcd diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresourcedefinition/strategy.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition/strategy.go similarity index 96% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresourcedefinition/strategy.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition/strategy.go index e802102bbe6..de6e34a74cf 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/registry/customresourcedefinition/strategy.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition/strategy.go @@ -28,8 +28,8 @@ import ( "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/validation" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation" ) type strategy struct { diff --git a/staging/src/k8s.io/kube-apiextensions-server/test/integration/BUILD b/staging/src/k8s.io/apiextensions-apiserver/test/integration/BUILD similarity index 79% rename from staging/src/k8s.io/kube-apiextensions-server/test/integration/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/test/integration/BUILD index 18b0011f175..fda8c71fcbe 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/test/integration/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/BUILD @@ -21,6 +21,9 @@ go_test( deps = [ "//vendor/github.com/coreos/etcd/clientv3:go_default_library", "//vendor/github.com/stretchr/testify/require:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apiserver:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/test/integration/testserver:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -29,8 +32,5 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/client-go/dynamic:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apiserver:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/test/integration/testserver:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/test/integration/apiserver.local.config/certificates/apiserver.crt b/staging/src/k8s.io/apiextensions-apiserver/test/integration/apiserver.local.config/certificates/apiserver.crt similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/test/integration/apiserver.local.config/certificates/apiserver.crt rename to staging/src/k8s.io/apiextensions-apiserver/test/integration/apiserver.local.config/certificates/apiserver.crt diff --git a/staging/src/k8s.io/kube-apiextensions-server/test/integration/apiserver.local.config/certificates/apiserver.key b/staging/src/k8s.io/apiextensions-apiserver/test/integration/apiserver.local.config/certificates/apiserver.key similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/test/integration/apiserver.local.config/certificates/apiserver.key rename to staging/src/k8s.io/apiextensions-apiserver/test/integration/apiserver.local.config/certificates/apiserver.key diff --git a/staging/src/k8s.io/kube-apiextensions-server/test/integration/basic_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/basic_test.go similarity index 99% rename from staging/src/k8s.io/kube-apiextensions-server/test/integration/basic_test.go rename to staging/src/k8s.io/apiextensions-apiserver/test/integration/basic_test.go index f4c19804fd8..0393ae86e02 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/test/integration/basic_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/basic_test.go @@ -22,6 +22,8 @@ import ( "testing" "time" + apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + "k8s.io/apiextensions-apiserver/test/integration/testserver" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -29,8 +31,6 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/dynamic" - apiextensionsv1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" - "k8s.io/kube-apiextensions-server/test/integration/testserver" ) func TestServerUp(t *testing.T) { diff --git a/staging/src/k8s.io/kube-apiextensions-server/test/integration/finalization_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/finalization_test.go similarity index 95% rename from staging/src/k8s.io/kube-apiextensions-server/test/integration/finalization_test.go rename to staging/src/k8s.io/apiextensions-apiserver/test/integration/finalization_test.go index f7d8cfc1fea..f2cb3722d6b 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/test/integration/finalization_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/finalization_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/require" + apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + "k8s.io/apiextensions-apiserver/test/integration/testserver" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apiextensionsv1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" - "k8s.io/kube-apiextensions-server/test/integration/testserver" ) func TestFinalization(t *testing.T) { diff --git a/staging/src/k8s.io/kube-apiextensions-server/test/integration/registration_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/registration_test.go similarity index 98% rename from staging/src/k8s.io/kube-apiextensions-server/test/integration/registration_test.go rename to staging/src/k8s.io/apiextensions-apiserver/test/integration/registration_test.go index 8530beae9e6..4dcccffbe92 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/test/integration/registration_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/registration_test.go @@ -28,15 +28,15 @@ import ( "github.com/coreos/etcd/clientv3" + apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + extensionsapiserver "k8s.io/apiextensions-apiserver/pkg/apiserver" + "k8s.io/apiextensions-apiserver/test/integration/testserver" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/dynamic" - apiextensionsv1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" - extensionsapiserver "k8s.io/kube-apiextensions-server/pkg/apiserver" - "k8s.io/kube-apiextensions-server/test/integration/testserver" ) func instantiateCustomResource(t *testing.T, instanceToCreate *unstructured.Unstructured, client *dynamic.ResourceClient, definition *apiextensionsv1beta1.CustomResourceDefinition) (*unstructured.Unstructured, error) { diff --git a/staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/BUILD b/staging/src/k8s.io/apiextensions-apiserver/test/integration/testserver/BUILD similarity index 74% rename from staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/BUILD rename to staging/src/k8s.io/apiextensions-apiserver/test/integration/testserver/BUILD index 5ffc1e193bf..305ab9d285e 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/testserver/BUILD @@ -16,6 +16,10 @@ go_library( tags = ["automanaged"], deps = [ "//vendor/github.com/pborman/uuid:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apiserver:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/cmd/server:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -26,9 +30,5 @@ go_library( "//vendor/k8s.io/apiserver/pkg/authorization/authorizerfactory:go_default_library", "//vendor/k8s.io/apiserver/pkg/server:go_default_library", "//vendor/k8s.io/client-go/dynamic:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apiserver:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/cmd/server:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/resources.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/testserver/resources.go similarity index 98% rename from staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/resources.go rename to staging/src/k8s.io/apiextensions-apiserver/test/integration/testserver/resources.go index c9a1a823051..ecf7227f8f8 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/resources.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/testserver/resources.go @@ -20,6 +20,8 @@ import ( "fmt" "time" + apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" + "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -28,8 +30,6 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/dynamic" - apiextensionsv1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" - "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset" ) func NewNoxuCustomResourceDefinition(scope apiextensionsv1beta1.ResourceScope) *apiextensionsv1beta1.CustomResourceDefinition { diff --git a/staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/start.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/testserver/start.go similarity index 96% rename from staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/start.go rename to staging/src/k8s.io/apiextensions-apiserver/test/integration/testserver/start.go index 3e51475b7ad..de23379c068 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/start.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/testserver/start.go @@ -25,14 +25,14 @@ import ( "github.com/pborman/uuid" + extensionsapiserver "k8s.io/apiextensions-apiserver/pkg/apiserver" + "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" + "k8s.io/apiextensions-apiserver/pkg/cmd/server" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/authorization/authorizerfactory" genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/client-go/dynamic" - extensionsapiserver "k8s.io/kube-apiextensions-server/pkg/apiserver" - "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset" - "k8s.io/kube-apiextensions-server/pkg/cmd/server" ) func DefaultServerConfig() (*extensionsapiserver.Config, error) { diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/BUILD b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/BUILD deleted file mode 100644 index c64e4065775..00000000000 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/BUILD +++ /dev/null @@ -1,18 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["interface.go"], - tags = ["automanaged"], - deps = [ - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/internalinterfaces:go_default_library", - ], -) diff --git a/vendor/k8s.io/apiextensions-apiserver b/vendor/k8s.io/apiextensions-apiserver new file mode 120000 index 00000000000..81227cf1342 --- /dev/null +++ b/vendor/k8s.io/apiextensions-apiserver @@ -0,0 +1 @@ +../../staging/src/k8s.io/apiextensions-apiserver \ No newline at end of file diff --git a/vendor/k8s.io/kube-apiextensions-server b/vendor/k8s.io/kube-apiextensions-server deleted file mode 120000 index c1386f12198..00000000000 --- a/vendor/k8s.io/kube-apiextensions-server +++ /dev/null @@ -1 +0,0 @@ -../../staging/src/k8s.io/kube-apiextensions-server \ No newline at end of file