github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename {kube- ->}apiextensions-{-> api}server

pull/6/head
Dr. Stefan Schimanski 2017-06-01 14:12:43 +02:00
parent 8df56da448
commit 33e50da9f4
150 changed files with 341 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/kube-apiserver/app/BUILD
View File

@ -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",
],
)

2
cmd/kube-apiserver/app/aggregator.go
View File

@ -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"

6
cmd/kube-apiserver/app/apiextensions.go
View File

@ -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"
)

2
cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go
View File

@ -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`,

24
hack/.linted_packages
View File

@ -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

4
hack/godep-save.sh
View File

@ -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

2
hack/lib/golang.sh
View File

@ -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[@]}"

2
hack/make-rules/helpers/cache_go_dirs.sh
View File

@ -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 \( \
\( \

2
hack/make-rules/test-integration.sh
View File

@ -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
)

2
hack/make-rules/test.sh
View File

@ -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 \

2
hack/update-codegen.sh
View File

@ -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

2
hack/verify-codegen.sh
View File

@ -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

16
pkg/master/thirdparty/BUILD vendored
View File

@ -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",
],
)

8
pkg/master/thirdparty/thirdparty.go vendored
View File

@ -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"

6
pkg/master/thirdparty/tprregistration_controller.go vendored
View File

@ -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"

4
pkg/master/thirdparty/tprregistration_controller_test.go vendored
View File

@ -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"
)

4
staging/src/k8s.io/kube-apiextensions-server/BUILD → staging/src/k8s.io/apiextensions-apiserver/BUILD
View File

@ -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",
],
)

2
staging/src/k8s.io/kube-apiextensions-server/Godeps/Godeps.json → staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json generated
View File

@ -1,5 +1,5 @@
{
"ImportPath": "k8s.io/kube-apiextensions-server",
"ImportPath": "k8s.io/apiextensions-apiserver",
"GoVersion": "go1.8",
"GodepVersion": "v79",
"Packages": [

0
staging/src/k8s.io/kube-apiextensions-server/OWNERS → staging/src/k8s.io/apiextensions-apiserver/OWNERS
View File

2
staging/src/k8s.io/kube-apiextensions-server/artifacts/customresource-01/noxu-apiservice.yaml → staging/src/k8s.io/apiextensions-apiserver/artifacts/customresource-01/noxu-apiservice.yaml
View File

@ -8,5 +8,5 @@ spec:
priority: 500
service:
name: api
namespace: kube-apiextensions
namespace: apiextensions
version: v1alpha1

0
staging/src/k8s.io/kube-apiextensions-server/artifacts/customresource-01/noxu-resource-definition.yaml → staging/src/k8s.io/apiextensions-apiserver/artifacts/customresource-01/noxu-resource-definition.yaml
View File

0
staging/src/k8s.io/kube-apiextensions-server/artifacts/customresource-01/noxu.yaml → staging/src/k8s.io/apiextensions-apiserver/artifacts/customresource-01/noxu.yaml
View File

2
staging/src/k8s.io/kube-apiextensions-server/artifacts/example/apiservice.yaml → staging/src/k8s.io/apiextensions-apiserver/artifacts/example/apiservice.yaml
View File

@ -8,5 +8,5 @@ spec:
priority: 100
service:
name: api
namespace: kube-apiextensions
namespace: apiextensions
version: v1alpha1

2
staging/src/k8s.io/kube-apiextensions-server/artifacts/example/auth-delegator.yaml → staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-delegator.yaml
View File

@ -10,4 +10,4 @@ subjects:
- apiVersion: v1
kind: ServiceAccount
name: apiserver
namespace: kube-apiextensions
namespace: apiextensions

2
staging/src/k8s.io/kube-apiextensions-server/artifacts/example/auth-reader.yaml → staging/src/k8s.io/apiextensions-apiserver/artifacts/example/auth-reader.yaml
View File

@ -11,4 +11,4 @@ subjects:
- apiVersion: v1
kind: ServiceAccount
name: apiserver
namespace: kube-apiextensions
namespace: apiextensions

4
staging/src/k8s.io/kube-apiextensions-server/artifacts/example/rc.yaml → staging/src/k8s.io/apiextensions-apiserver/artifacts/example/rc.yaml
View File

@ -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"

2
staging/src/k8s.io/kube-apiextensions-server/artifacts/example/sa.yaml → staging/src/k8s.io/apiextensions-apiserver/artifacts/example/sa.yaml
View File

@ -2,4 +2,4 @@ kind: ServiceAccount
apiVersion: v1
metadata:
name: apiserver
namespace: kube-apiextensions
namespace: apiextensions

2
staging/src/k8s.io/kube-apiextensions-server/artifacts/example/service.yaml → staging/src/k8s.io/apiextensions-apiserver/artifacts/example/service.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: api
namespace: kube-apiextensions
namespace: apiextensions
spec:
ports:
- port: 443

4
staging/src/k8s.io/kube-apiextensions-server/artifacts/simple-image/Dockerfile → staging/src/k8s.io/apiextensions-apiserver/artifacts/simple-image/Dockerfile
View File

@ -13,5 +13,5 @@
# limitations under the License.
FROM fedora
ADD kube-apiextensions-server /
ENTRYPOINT ["/kube-apiextensions-server"]
ADD apiextensions-apiserver /
ENTRYPOINT ["/apiextensions-apiserver"]

8
staging/src/k8s.io/kube-apiextensions-server/hack/build-image.sh → staging/src/k8s.io/apiextensions-apiserver/hack/build-image.sh
View File

@ -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

18
staging/src/k8s.io/kube-apiextensions-server/hack/update-codegen.sh → staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh
View File

@ -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
"$@"

0
staging/src/k8s.io/kube-apiextensions-server/hack/verify-codegen.sh → staging/src/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh
View File

2
staging/src/k8s.io/kube-apiextensions-server/main.go → staging/src/k8s.io/apiextensions-apiserver/main.go
View File

@ -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() {

0
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/BUILD → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/BUILD
View File

0
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/doc.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/doc.go
View File

0
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/helpers.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/helpers.go
View File

0
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/helpers_test.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/helpers_test.go
View File

6
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/BUILD → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/BUILD
View File

@ -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",
],
)

6
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/install.go
View File

@ -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{

2
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install_test.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install/install_test.go
View File

@ -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) {

0
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/register.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/register.go
View File

0
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/types.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/types.go
View File

2
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/BUILD → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/BUILD
View File

@ -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",
],
)

0
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/defaults.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/defaults.go
View File

2
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/doc.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/doc.go
View File

@ -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.

126
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/generated.pb.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.pb.go
View File

@ -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,
}

2
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/generated.proto → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto
View File

@ -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";

0
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/register.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/register.go
View File

0
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/types.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/types.go
View File

2
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/zz_generated.conversion.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/zz_generated.conversion.go
View File

@ -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"
)

0
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/zz_generated.deepcopy.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/zz_generated.deepcopy.go
View File

0
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/zz_generated.defaults.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/zz_generated.defaults.go
View File

4
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/validation/BUILD → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/BUILD
View File

@ -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",
],
)

2
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/validation/validation.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go
View File

@ -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

2
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/validation/validation_test.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation_test.go
View File

@ -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 {

0
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/zz_generated.deepcopy.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/zz_generated.deepcopy.go
View File

26
staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/BUILD → staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/BUILD
View File

@ -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",
],
)

24
staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/apiserver.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go
View File

@ -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
}

0
staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/customresource_discovery.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery.go
View File

6
staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/customresource_discovery_controller.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go
View File

@ -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 {

8
staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/customresource_handler.go → staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go
View File

@ -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.

2
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/BUILD → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/BUILD
View File

@ -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",
],
)

2
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/clientset.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/clientset.go
View File

@ -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 {

0
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/doc.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/doc.go
View File

8
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/BUILD → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/BUILD
View File

@ -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",
],
)

6
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/clientset_generated.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/clientset_generated.go
View File

@ -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.

0
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/doc.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/doc.go
View File

2
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/register.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/register.go
View File

@ -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()

2
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/BUILD → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/BUILD
View File

@ -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",
],
)

0
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/doc.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/doc.go
View File

2
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/register.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/register.go
View File

@ -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()

4
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/BUILD → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/BUILD
View File

@ -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",
],
)

4
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/apiextensions_client.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/apiextensions_client.go
View File

@ -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 {

4
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go
View File

@ -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.

0
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/doc.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/doc.go
View File

4
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/BUILD → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/BUILD
View File

@ -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",
],
)

0
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/doc.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/doc.go
View File

2
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_apiextensions_client.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_apiextensions_client.go
View File

@ -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 {

2
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_customresourcedefinition.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_customresourcedefinition.go
View File

@ -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

0
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/generated_expansion.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/generated_expansion.go
View File

2
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/BUILD → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/BUILD
View File

@ -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",
],
)

2
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/clientset.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/clientset.go
View File

@ -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 {

0
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/doc.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/doc.go
View File

8
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/fake/BUILD → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/BUILD
View File

@ -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",
],
)

6
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/fake/clientset_generated.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/clientset_generated.go
View File

@ -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.

0
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/fake/doc.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/doc.go
View File

2
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/fake/register.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/register.go
View File

@ -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()

2
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/scheme/BUILD → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/scheme/BUILD
View File

@ -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",
],
)

0
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/scheme/doc.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/scheme/doc.go
View File

2
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/scheme/register.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/scheme/register.go
View File

@ -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"
)

4
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/BUILD → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/BUILD
View File

@ -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",
],
)

2
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/apiextensions_client.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/apiextensions_client.go
View File

@ -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 {

4
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/customresourcedefinition.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/customresourcedefinition.go
View File

@ -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.

0
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/doc.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/doc.go
View File

4
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/BUILD → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/BUILD
View File

@ -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",
],
)

0
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/doc.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/doc.go
View File

2
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/fake_apiextensions_client.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/fake_apiextensions_client.go
View File

@ -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 {

2
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/fake_customresourcedefinition.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/fake_customresourcedefinition.go
View File

@ -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

0
staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/generated_expansion.go → staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/generated_expansion.go
View File

8
staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/BUILD → staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/BUILD
View File

@ -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",
],
)

Some files were not shown because too many files have changed in this diff Show More