From e3a3d108fb382caaa64503254bcd98ab29ba6a96 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Wed, 16 Aug 2017 15:04:52 +0200 Subject: [PATCH] Fixup after k8s.io/{kube-gen -> code-generator} rename --- build/root/Makefile.generated_files | 20 ++++----- hack/.golint_failures | 44 +++++++++---------- hack/lib/protoc.sh | 2 +- hack/make-rules/helpers/cache_go_dirs.sh | 2 +- hack/make-rules/test.sh | 4 +- hack/staging-import-restrictions.json | 10 ++--- hack/update-codegen.sh | 16 +++---- hack/update-generated-protobuf-dockerized.sh | 4 +- hack/update-generated-runtime-dockerized.sh | 2 +- hack/verify-api-groups.sh | 2 +- hack/verify-codegen.sh | 10 ++--- hack/verify-import-boss.sh | 2 +- pkg/generated/openapi/BUILD | 2 +- pkg/generated/openapi/def.bzl | 4 +- staging/BUILD | 36 +++++++-------- staging/README.md | 2 +- staging/prime-apimachinery.sh | 2 +- .../hack/update-codegen.sh | 8 ++-- .../k8s.io/apimachinery/pkg/util/sets/BUILD | 4 +- .../apimachinery/pkg/util/sets/types/types.go | 2 +- .../k8s.io/code-generator/Godeps/Godeps.json | 2 +- .../code-generator/cmd/client-gen/BUILD | 14 +++--- .../code-generator/cmd/client-gen/README.md | 2 +- .../code-generator/cmd/client-gen/args/BUILD | 2 +- .../cmd/client-gen/args/args.go | 2 +- .../cmd/client-gen/generators/BUILD | 18 ++++---- .../client-gen/generators/client_generator.go | 12 ++--- .../cmd/client-gen/generators/fake/BUILD | 10 ++--- .../generators/fake/fake_client_generator.go | 8 ++-- .../fake/generator_fake_for_clientset.go | 2 +- .../fake/generator_fake_for_group.go | 2 +- .../fake/generator_fake_for_type.go | 4 +- .../generators/generator_for_clientset.go | 2 +- .../generators/generator_for_group.go | 4 +- .../generators/generator_for_type.go | 2 +- .../cmd/client-gen/generators/scheme/BUILD | 4 +- .../generators/scheme/generator_for_scheme.go | 4 +- .../code-generator/cmd/client-gen/main.go | 6 +-- .../code-generator/cmd/conversion-gen/BUILD | 4 +- .../code-generator/cmd/conversion-gen/main.go | 2 +- .../code-generator/cmd/go-to-protobuf/BUILD | 6 +-- .../code-generator/cmd/go-to-protobuf/main.go | 2 +- .../cmd/go-to-protobuf/protobuf/BUILD | 2 +- .../cmd/go-to-protobuf/protobuf/parser.go | 2 +- .../code-generator/cmd/informer-gen/BUILD | 4 +- .../cmd/informer-gen/generators/BUILD | 4 +- .../cmd/informer-gen/generators/factory.go | 2 +- .../cmd/informer-gen/generators/generic.go | 2 +- .../informer-gen/generators/groupinterface.go | 2 +- .../cmd/informer-gen/generators/informer.go | 4 +- .../cmd/informer-gen/generators/packages.go | 4 +- .../code-generator/cmd/informer-gen/main.go | 2 +- .../code-generator/cmd/lister-gen/BUILD | 4 +- .../cmd/lister-gen/generators/BUILD | 4 +- .../cmd/lister-gen/generators/expansion.go | 2 +- .../cmd/lister-gen/generators/lister.go | 4 +- .../code-generator/cmd/lister-gen/main.go | 2 +- .../code-generator/hack/update-codegen.sh | 10 ++--- .../code-generator/test/apis/testgroup/BUILD | 4 +- .../code-generator/test/apis/testgroup/doc.go | 2 +- .../test/apis/testgroup/install/BUILD | 4 +- .../test/apis/testgroup/install/install.go | 4 +- .../test/clientset/internal/BUILD | 8 ++-- .../test/clientset/internal/clientset.go | 2 +- .../test/clientset/internal/fake/BUILD | 8 ++-- .../internal/fake/clientset_generated.go | 6 +-- .../test/clientset/internal/fake/register.go | 2 +- .../test/clientset/internal/scheme/BUILD | 2 +- .../clientset/internal/scheme/register.go | 2 +- .../typed/testgroup/internalversion/BUILD | 6 +-- .../testgroup/internalversion/fake/BUILD | 4 +- .../fake/fake_testgroup_client.go | 2 +- .../internalversion/fake/fake_testtype.go | 2 +- .../internalversion/testgroup_client.go | 2 +- .../testgroup/internalversion/testtype.go | 4 +- .../test/clientset/versioned/BUILD | 8 ++-- .../test/clientset/versioned/clientset.go | 2 +- .../test/clientset/versioned/fake/BUILD | 8 ++-- .../versioned/fake/clientset_generated.go | 6 +-- .../test/clientset/versioned/fake/register.go | 2 +- .../test/clientset/versioned/scheme/BUILD | 2 +- .../clientset/versioned/scheme/register.go | 2 +- .../versioned/typed/testgroup/v1/BUILD | 6 +-- .../versioned/typed/testgroup/v1/fake/BUILD | 4 +- .../v1/fake/fake_testgroup_client.go | 2 +- .../typed/testgroup/v1/fake/fake_testtype.go | 2 +- .../typed/testgroup/v1/testgroup_client.go | 4 +- .../versioned/typed/testgroup/v1/testtype.go | 4 +- .../test/informers/externalversions/BUILD | 12 ++--- .../informers/externalversions/factory.go | 6 +-- .../informers/externalversions/generic.go | 2 +- .../externalversions/internalinterfaces/BUILD | 2 +- .../internalinterfaces/factory_interfaces.go | 2 +- .../externalversions/testgroup/BUILD | 6 +-- .../externalversions/testgroup/interface.go | 4 +- .../externalversions/testgroup/v1/BUILD | 8 ++-- .../testgroup/v1/interface.go | 2 +- .../externalversions/testgroup/v1/testtype.go | 8 ++-- .../test/informers/internalversion/BUILD | 12 ++--- .../test/informers/internalversion/factory.go | 6 +-- .../test/informers/internalversion/generic.go | 2 +- .../internalversion/internalinterfaces/BUILD | 2 +- .../internalinterfaces/factory_interfaces.go | 2 +- .../informers/internalversion/testgroup/BUILD | 6 +-- .../internalversion/testgroup/interface.go | 4 +- .../testgroup/internalversion/BUILD | 8 ++-- .../testgroup/internalversion/interface.go | 2 +- .../testgroup/internalversion/testtype.go | 8 ++-- .../listers/testgroup/internalversion/BUILD | 2 +- .../testgroup/internalversion/testtype.go | 2 +- .../test/listers/testgroup/v1/BUILD | 2 +- .../test/listers/testgroup/v1/testtype.go | 2 +- .../kube-aggregator/hack/update-codegen.sh | 8 ++-- .../src/k8s.io/metrics/hack/update-codegen.sh | 4 +- .../sample-apiserver/hack/update-codegen.sh | 8 ++-- 115 files changed, 297 insertions(+), 297 deletions(-) diff --git a/build/root/Makefile.generated_files b/build/root/Makefile.generated_files index 08c59d8aa8f..1d6315747b4 100644 --- a/build/root/Makefile.generated_files +++ b/build/root/Makefile.generated_files @@ -69,7 +69,7 @@ verify_generated_files: verify_gen_deepcopy \ # # expect one file to be regenerated # make gen_deepcopy # # expect nothing to be rebuilt, finish in O(seconds) -# touch vendor/k8s.io/kube-gen/cmd/deepcopy-gen/main.go +# touch vendor/k8s.io/code-generator/cmd/deepcopy-gen/main.go # make gen_deepcopy # # expect deepcopy-gen is built exactly once # # expect many files to be regenerated @@ -88,7 +88,7 @@ verify_generated_files: verify_gen_deepcopy \ # # expect one file to be regenerated # make gen_conversion # # expect nothing to be rebuilt, finish in O(seconds) -# touch vendor/k8s.io/kube-gen/cmd/conversion-gen/main.go +# touch vendor/k8s.io/code-generator/cmd/conversion-gen/main.go # make gen_conversion # # expect conversion-gen is built exactly once # # expect many files to be regenerated @@ -274,7 +274,7 @@ $(META_DIR)/$(DEEPCOPY_GEN).mk: (echo -n "$(DEEPCOPY_GEN): "; \ ./hack/run-in-gopath.sh go list \ -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ - ./vendor/k8s.io/kube-gen/cmd/deepcopy-gen \ + ./vendor/k8s.io/code-generator/cmd/deepcopy-gen \ | grep --color=never "^$(PRJ_SRC_PATH)/" \ | xargs ./hack/run-in-gopath.sh go list \ -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \ @@ -299,7 +299,7 @@ sinclude $(META_DIR)/$(DEEPCOPY_GEN).mk # newer than the binary, and try to rebuild it over and over. So we touch it, # and make is happy. $(DEEPCOPY_GEN): - hack/make-rules/build.sh ./vendor/k8s.io/kube-gen/cmd/deepcopy-gen + hack/make-rules/build.sh ./vendor/k8s.io/code-generator/cmd/deepcopy-gen touch $@ # @@ -424,7 +424,7 @@ $(META_DIR)/$(DEFAULTER_GEN).mk: (echo -n "$(DEFAULTER_GEN): "; \ ./hack/run-in-gopath.sh go list \ -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ - ./vendor/k8s.io/kube-gen/cmd/defaulter-gen \ + ./vendor/k8s.io/code-generator/cmd/defaulter-gen \ | grep --color=never "^$(PRJ_SRC_PATH)/" \ | xargs ./hack/run-in-gopath.sh go list \ -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \ @@ -449,7 +449,7 @@ sinclude $(META_DIR)/$(DEFAULTER_GEN).mk # newer than the binary, and try to rebuild it over and over. So we touch it, # and make is happy. $(DEFAULTER_GEN): - hack/make-rules/build.sh ./vendor/k8s.io/kube-gen/cmd/defaulter-gen + hack/make-rules/build.sh ./vendor/k8s.io/code-generator/cmd/defaulter-gen touch $@ # @@ -522,7 +522,7 @@ $(META_DIR)/$(OPENAPI_GEN).mk: (echo -n "$(OPENAPI_GEN): "; \ ./hack/run-in-gopath.sh go list \ -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ - ./vendor/k8s.io/kube-gen/cmd/openapi-gen \ + ./vendor/k8s.io/code-generator/cmd/openapi-gen \ | grep --color=never "^$(PRJ_SRC_PATH)/" \ | xargs ./hack/run-in-gopath.sh go list \ -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \ @@ -547,7 +547,7 @@ sinclude $(META_DIR)/$(OPENAPI_GEN).mk # newer than the binary, and try to rebuild it over and over. So we touch it, # and make is happy. $(OPENAPI_GEN): - hack/make-rules/build.sh ./vendor/k8s.io/kube-gen/cmd/openapi-gen + hack/make-rules/build.sh ./vendor/k8s.io/code-generator/cmd/openapi-gen touch $@ # @@ -716,7 +716,7 @@ $(META_DIR)/$(CONVERSION_GEN).mk: (echo -n "$(CONVERSION_GEN): "; \ ./hack/run-in-gopath.sh go list \ -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ - ./vendor/k8s.io/kube-gen/cmd/conversion-gen \ + ./vendor/k8s.io/code-generator/cmd/conversion-gen \ | grep --color=never "^$(PRJ_SRC_PATH)/" \ | xargs ./hack/run-in-gopath.sh go list \ -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \ @@ -741,5 +741,5 @@ sinclude $(META_DIR)/$(CONVERSION_GEN).mk # newer than the binary, and try to rebuild it over and over. So we touch it, # and make is happy. $(CONVERSION_GEN): - hack/make-rules/build.sh ./vendor/k8s.io/kube-gen/cmd/conversion-gen + hack/make-rules/build.sh ./vendor/k8s.io/code-generator/cmd/conversion-gen touch $@ diff --git a/hack/.golint_failures b/hack/.golint_failures index aa17214fef9..9972dc6382b 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -753,6 +753,28 @@ staging/src/k8s.io/client-go/util/integer staging/src/k8s.io/client-go/util/jsonpath staging/src/k8s.io/client-go/util/retry staging/src/k8s.io/client-go/util/testing +staging/src/k8s.io/code-generator/cmd/client-gen/args +staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake +staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme +staging/src/k8s.io/code-generator/cmd/client-gen/types +staging/src/k8s.io/code-generator/cmd/conversion-gen/generators +staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf +staging/src/k8s.io/code-generator/cmd/informer-gen/generators +staging/src/k8s.io/code-generator/cmd/lister-gen/generators +staging/src/k8s.io/code-generator/test/apis/testgroup +staging/src/k8s.io/code-generator/test/apis/testgroup/v1 +staging/src/k8s.io/code-generator/test/clientset/internal +staging/src/k8s.io/code-generator/test/clientset/internal/fake +staging/src/k8s.io/code-generator/test/clientset/internal/scheme +staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion +staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake +staging/src/k8s.io/code-generator/test/clientset/versioned +staging/src/k8s.io/code-generator/test/clientset/versioned/fake +staging/src/k8s.io/code-generator/test/clientset/versioned/scheme +staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1 +staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake +staging/src/k8s.io/code-generator/test/informers/externalversions/internalinterfaces +staging/src/k8s.io/code-generator/test/informers/internalversion/internalinterfaces staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1 staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/validation @@ -764,28 +786,6 @@ staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister staging/src/k8s.io/kube-aggregator/pkg/controllers/status staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/etcd -staging/src/k8s.io/kube-gen/cmd/client-gen/args -staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake -staging/src/k8s.io/kube-gen/cmd/client-gen/generators/scheme -staging/src/k8s.io/kube-gen/cmd/client-gen/types -staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators -staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf -staging/src/k8s.io/kube-gen/cmd/informer-gen/generators -staging/src/k8s.io/kube-gen/cmd/lister-gen/generators -staging/src/k8s.io/kube-gen/test/apis/testgroup -staging/src/k8s.io/kube-gen/test/apis/testgroup/v1 -staging/src/k8s.io/kube-gen/test/clientset/internal -staging/src/k8s.io/kube-gen/test/clientset/internal/fake -staging/src/k8s.io/kube-gen/test/clientset/internal/scheme -staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion -staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake -staging/src/k8s.io/kube-gen/test/clientset/versioned -staging/src/k8s.io/kube-gen/test/clientset/versioned/fake -staging/src/k8s.io/kube-gen/test/clientset/versioned/scheme -staging/src/k8s.io/kube-gen/test/clientset/versioned/typed/testgroup/v1 -staging/src/k8s.io/kube-gen/test/clientset/versioned/typed/testgroup/v1/fake -staging/src/k8s.io/kube-gen/test/informers/externalversions/internalinterfaces -staging/src/k8s.io/kube-gen/test/informers/internalversion/internalinterfaces staging/src/k8s.io/metrics/pkg/apis/custom_metrics staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1 staging/src/k8s.io/metrics/pkg/apis/metrics diff --git a/hack/lib/protoc.sh b/hack/lib/protoc.sh index b1e8cb60c95..980684cbd8a 100644 --- a/hack/lib/protoc.sh +++ b/hack/lib/protoc.sh @@ -28,7 +28,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" function kube::protoc::generate_proto() { kube::golang::setup_env local bins=( - vendor/k8s.io/kube-gen/cmd/go-to-protobuf/protoc-gen-gogo + vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo ) make -C "${KUBE_ROOT}" WHAT="${bins[*]}" diff --git a/hack/make-rules/helpers/cache_go_dirs.sh b/hack/make-rules/helpers/cache_go_dirs.sh index dd385e622d5..a16f78b8c02 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/apiextensions-apiserver ./vendor/k8s.io/metrics ./vendor/k8s.io/sample-apiserver ./vendor/k8s.io/api ./vendor/k8s.io/client-go ./vendor/k8s.io/kube-gen \ + 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 ./vendor/k8s.io/api ./vendor/k8s.io/client-go ./vendor/k8s.io/code-generator \ \( \ -not \( \ \( \ diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh index e243b22aba7..f7f0d812f76 100755 --- a/hack/make-rules/test.sh +++ b/hack/make-rules/test.sh @@ -274,11 +274,11 @@ runTests() { # separate files. # ignore paths: - # vendor/k8s.io/kube-gen/cmd/generator: is fragile when run under coverage, so ignore it for now. + # vendor/k8s.io/code-generator/cmd/generator: is fragile when run under coverage, so ignore it for now. # https://github.com/kubernetes/kubernetes/issues/24967 # vendor/k8s.io/client-go/1.4/rest: causes cover internal errors # https://github.com/golang/go/issues/16540 - cover_ignore_dirs="vendor/k8s.io/kube-gen/cmd/generator|vendor/k8s.io/client-go/1.4/rest" + cover_ignore_dirs="vendor/k8s.io/code-generator/cmd/generator|vendor/k8s.io/client-go/1.4/rest" for path in $(echo $cover_ignore_dirs | sed 's/|/ /g'); do echo -e "skipped\tk8s.io/kubernetes/$path" done diff --git a/hack/staging-import-restrictions.json b/hack/staging-import-restrictions.json index 3d421f24495..51bd3e90100 100644 --- a/hack/staging-import-restrictions.json +++ b/hack/staging-import-restrictions.json @@ -14,23 +14,23 @@ ] }, { - "baseImportPath": "./vendor/k8s.io/kube-gen/", + "baseImportPath": "./vendor/k8s.io/code-generator/", "ignoredSubTrees": [ - "./vendor/k8s.io/kube-gen/test" + "./vendor/k8s.io/code-generator/test" ], "allowedImports": [ "k8s.io/gengo", - "k8s.io/kube-gen", + "k8s.io/code-generator", "k8s.io/kube-openapi" ] }, { - "baseImportPath": "./vendor/k8s.io/kube-gen/test/", + "baseImportPath": "./vendor/k8s.io/code-generator/test/", "allowedImports": [ "k8s.io/apimachinery", "k8s.io/client-go", "k8s.io/gengo", - "k8s.io/kube-gen/test", + "k8s.io/code-generator/test", "k8s.io/kube-openapi" ] }, diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 3d35adfff76..8fae4073c72 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -24,9 +24,9 @@ source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::setup_env BUILD_TARGETS=( - vendor/k8s.io/kube-gen/cmd/client-gen - vendor/k8s.io/kube-gen/cmd/lister-gen - vendor/k8s.io/kube-gen/cmd/informer-gen + vendor/k8s.io/code-generator/cmd/client-gen + vendor/k8s.io/code-generator/cmd/lister-gen + vendor/k8s.io/code-generator/cmd/informer-gen ) make -C "${KUBE_ROOT}" WHAT="${BUILD_TARGETS[*]}" @@ -122,8 +122,8 @@ ${informergen} \ # You may add additional calls of code generators like set-gen above. # call generation on sub-project for now -KUBEGEN_PKG=./vendor/k8s.io/kube-gen vendor/k8s.io/kube-gen/hack/update-codegen.sh -KUBEGEN_PKG=./vendor/k8s.io/kube-gen vendor/k8s.io/kube-aggregator/hack/update-codegen.sh -KUBEGEN_PKG=./vendor/k8s.io/kube-gen vendor/k8s.io/sample-apiserver/hack/update-codegen.sh -KUBEGEN_PKG=./vendor/k8s.io/kube-gen vendor/k8s.io/apiextensions-apiserver/hack/update-codegen.sh -KUBEGEN_PKG=./vendor/k8s.io/kube-gen vendor/k8s.io/metrics/hack/update-codegen.sh +CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/code-generator/hack/update-codegen.sh +CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/kube-aggregator/hack/update-codegen.sh +CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/sample-apiserver/hack/update-codegen.sh +CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/apiextensions-apiserver/hack/update-codegen.sh +CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/metrics/hack/update-codegen.sh diff --git a/hack/update-generated-protobuf-dockerized.sh b/hack/update-generated-protobuf-dockerized.sh index 17716e936fd..e81618fff6d 100755 --- a/hack/update-generated-protobuf-dockerized.sh +++ b/hack/update-generated-protobuf-dockerized.sh @@ -24,8 +24,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::setup_env BINS=( - vendor/k8s.io/kube-gen/cmd/go-to-protobuf - vendor/k8s.io/kube-gen/cmd/go-to-protobuf/protoc-gen-gogo + vendor/k8s.io/code-generator/cmd/go-to-protobuf + vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo ) make -C "${KUBE_ROOT}" WHAT="${BINS[*]}" diff --git a/hack/update-generated-runtime-dockerized.sh b/hack/update-generated-runtime-dockerized.sh index febcc48dca1..37f1aa5b8b1 100755 --- a/hack/update-generated-runtime-dockerized.sh +++ b/hack/update-generated-runtime-dockerized.sh @@ -25,7 +25,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::setup_env BINS=( - vendor/k8s.io/kube-gen/cmd/go-to-protobuf/protoc-gen-gogo + vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo ) make -C "${KUBE_ROOT}" WHAT="${BINS[*]}" diff --git a/hack/verify-api-groups.sh b/hack/verify-api-groups.sh index bbfcb0f0200..88de8b7f6ab 100755 --- a/hack/verify-api-groups.sh +++ b/hack/verify-api-groups.sh @@ -71,7 +71,7 @@ groups_without_codegen=( "imagepolicy" "admission" ) -client_gen_file="${KUBE_ROOT}/vendor/k8s.io/kube-gen/cmd/client-gen/main.go" +client_gen_file="${KUBE_ROOT}/vendor/k8s.io/code-generator/cmd/client-gen/main.go" for group_dirname in "${group_dirnames[@]}"; do if ! grep -q "${group_dirname}/" "${client_gen_file}" ; then diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh index 0e497fe4ffb..af94a334ae0 100755 --- a/hack/verify-codegen.sh +++ b/hack/verify-codegen.sh @@ -27,10 +27,10 @@ kube::golang::setup_env # # Note: these must be before the main script call because the later calls the sub-project's # update-codegen.sh scripts. We wouldn't see any error on changes then. -KUBEGEN_PKG=./vendor/k8s.io/kube-gen vendor/k8s.io/kube-gen/hack/verify-codegen.sh -KUBEGEN_PKG=./vendor/k8s.io/kube-gen vendor/k8s.io/kube-aggregator/hack/verify-codegen.sh -KUBEGEN_PKG=./vendor/k8s.io/kube-gen vendor/k8s.io/sample-apiserver/hack/verify-codegen.sh -KUBEGEN_PKG=./vendor/k8s.io/kube-gen vendor/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh -KUBEGEN_PKG=./vendor/k8s.io/kube-gen vendor/k8s.io/metrics/hack/verify-codegen.sh +CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/code-generator/hack/verify-codegen.sh +CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/kube-aggregator/hack/verify-codegen.sh +CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/sample-apiserver/hack/verify-codegen.sh +CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh +CODEGEN_PKG=./vendor/k8s.io/code-generator vendor/k8s.io/metrics/hack/verify-codegen.sh "${KUBE_ROOT}/hack/update-codegen.sh" --verify-only diff --git a/hack/verify-import-boss.sh b/hack/verify-import-boss.sh index 67fdb86c806..7e112a4ac69 100755 --- a/hack/verify-import-boss.sh +++ b/hack/verify-import-boss.sh @@ -23,6 +23,6 @@ source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::setup_env -make -C "${KUBE_ROOT}" WHAT=vendor/k8s.io/kube-gen/cmd/import-boss +make -C "${KUBE_ROOT}" WHAT=vendor/k8s.io/code-generator/cmd/import-boss $(kube::util::find-binary "import-boss") --verify-only diff --git a/pkg/generated/openapi/BUILD b/pkg/generated/openapi/BUILD index bc59dcd9045..86cd0e7c362 100644 --- a/pkg/generated/openapi/BUILD +++ b/pkg/generated/openapi/BUILD @@ -55,8 +55,8 @@ openapi_library( "k8s.io/apiserver/pkg/apis/audit/v1beta1", "k8s.io/apiserver/pkg/apis/example/v1", "k8s.io/client-go/pkg/version", + "k8s.io/code-generator/test/apis/testgroup/v1", "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1", - "k8s.io/kube-gen/test/apis/testgroup/v1", "k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1", "k8s.io/metrics/pkg/apis/metrics/v1alpha1", ], diff --git a/pkg/generated/openapi/def.bzl b/pkg/generated/openapi/def.bzl index 3b1f1164bee..fa530f2b745 100644 --- a/pkg/generated/openapi/def.bzl +++ b/pkg/generated/openapi/def.bzl @@ -17,7 +17,7 @@ def openapi_library(name, tags, srcs, openapi_targets=[], vendor_targets=[]): srcs = srcs + ["//hack/boilerplate:boilerplate.go.txt"], outs = ["zz_generated.openapi.go"], cmd = " ".join([ - "$(location //vendor/k8s.io/kube-gen/cmd/openapi-gen)", + "$(location //vendor/k8s.io/code-generator/cmd/openapi-gen)", "--v 1", "--logtostderr", "--go-header-file $(location //hack/boilerplate:boilerplate.go.txt)", @@ -27,5 +27,5 @@ def openapi_library(name, tags, srcs, openapi_targets=[], vendor_targets=[]): "&& cp pkg/generated/openapi/zz_generated.openapi.go $(location :zz_generated.openapi.go)", ]), go_deps = deps, - tools = ["//vendor/k8s.io/kube-gen/cmd/openapi-gen"], + tools = ["//vendor/k8s.io/code-generator/cmd/openapi-gen"], ) diff --git a/staging/BUILD b/staging/BUILD index 36ba8ac835f..442a01c5ba0 100644 --- a/staging/BUILD +++ b/staging/BUILD @@ -196,25 +196,25 @@ filegroup( "//staging/src/k8s.io/client-go/util/retry:all-srcs", "//staging/src/k8s.io/client-go/util/testing:all-srcs", "//staging/src/k8s.io/client-go/util/workqueue:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/client-gen:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/conversion-gen:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/deepcopy-gen:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/defaulter-gen:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/go-to-protobuf:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/import-boss:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/informer-gen:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/lister-gen:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/openapi-gen:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/set-gen:all-srcs", + "//staging/src/k8s.io/code-generator/test/apis/testgroup:all-srcs", + "//staging/src/k8s.io/code-generator/test/clientset/internal:all-srcs", + "//staging/src/k8s.io/code-generator/test/clientset/versioned:all-srcs", + "//staging/src/k8s.io/code-generator/test/informers/externalversions:all-srcs", + "//staging/src/k8s.io/code-generator/test/informers/internalversion:all-srcs", + "//staging/src/k8s.io/code-generator/test/listers/testgroup/internalversion:all-srcs", + "//staging/src/k8s.io/code-generator/test/listers/testgroup/v1:all-srcs", + "//staging/src/k8s.io/code-generator/third_party/forked/golang/reflect:all-srcs", "//staging/src/k8s.io/kube-aggregator:all-srcs", - "//staging/src/k8s.io/kube-gen/cmd/client-gen:all-srcs", - "//staging/src/k8s.io/kube-gen/cmd/conversion-gen:all-srcs", - "//staging/src/k8s.io/kube-gen/cmd/deepcopy-gen:all-srcs", - "//staging/src/k8s.io/kube-gen/cmd/defaulter-gen:all-srcs", - "//staging/src/k8s.io/kube-gen/cmd/go-to-protobuf:all-srcs", - "//staging/src/k8s.io/kube-gen/cmd/import-boss:all-srcs", - "//staging/src/k8s.io/kube-gen/cmd/informer-gen:all-srcs", - "//staging/src/k8s.io/kube-gen/cmd/lister-gen:all-srcs", - "//staging/src/k8s.io/kube-gen/cmd/openapi-gen:all-srcs", - "//staging/src/k8s.io/kube-gen/cmd/set-gen:all-srcs", - "//staging/src/k8s.io/kube-gen/test/apis/testgroup:all-srcs", - "//staging/src/k8s.io/kube-gen/test/clientset/internal:all-srcs", - "//staging/src/k8s.io/kube-gen/test/clientset/versioned:all-srcs", - "//staging/src/k8s.io/kube-gen/test/informers/externalversions:all-srcs", - "//staging/src/k8s.io/kube-gen/test/informers/internalversion:all-srcs", - "//staging/src/k8s.io/kube-gen/test/listers/testgroup/internalversion:all-srcs", - "//staging/src/k8s.io/kube-gen/test/listers/testgroup/v1:all-srcs", - "//staging/src/k8s.io/kube-gen/third_party/forked/golang/reflect:all-srcs", "//staging/src/k8s.io/metrics/pkg/apis/custom_metrics:all-srcs", "//staging/src/k8s.io/metrics/pkg/apis/metrics:all-srcs", "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset:all-srcs", diff --git a/staging/README.md b/staging/README.md index ca9b88ed3a4..f750d3147c4 100644 --- a/staging/README.md +++ b/staging/README.md @@ -12,7 +12,7 @@ Repositories currently staged here: - [`k8s.io/apiserver`](https://github.com/kubernetes/apiserver) - [`k8s.io/client-go`](https://github.com/kubernetes/client-go) - [`k8s.io/kube-aggregator`](https://github.com/kubernetes/kube-aggregator) -- [`k8s.io/kube-gen`](https://github.com/kubernetes/kube-gen) (about to be published) +- [`k8s.io/code-generator`](https://github.com/kubernetes/code-generator) (about to be published) - [`k8s.io/metrics`](https://github.com/kubernetes/metrics) - [`k8s.io/sample-apiserver`](https://github.com/kubernetes/sample-apiserver) diff --git a/staging/prime-apimachinery.sh b/staging/prime-apimachinery.sh index 0a05d7c8f24..c9d4e96fb11 100755 --- a/staging/prime-apimachinery.sh +++ b/staging/prime-apimachinery.sh @@ -72,7 +72,7 @@ while read package; do done <${dir}/packages.txt # this file generates something or other, but we don't want to accidentally have it generate into an apimachinery package -git checkout vendor/k8s.io/kube-gen/cmd/set-gen/main.go +git checkout vendor/k8s.io/code-generator/cmd/set-gen/main.go # now run gofmt to get the sorting right diff --git a/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh b/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh index 7a30bf1356b..efc52ecd886 100755 --- a/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh +++ b/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh @@ -20,7 +20,7 @@ set -o pipefail SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/.. SCRIPT_BASE=${SCRIPT_ROOT}/../.. -KUBEGEN_PKG=${KUBEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/kube-gen 2>/dev/null || echo k8s.io/kube-gen)} +CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo k8s.io/code-generator)} if LANG=C sed --help 2>&1 | grep -q GNU; then SED="sed" @@ -41,7 +41,7 @@ trap cleanup EXIT echo "Building client-gen" CLIENTGEN="${PWD}/client-gen-binary" -go build -o "${CLIENTGEN}" ${KUBEGEN_PKG}/cmd/client-gen +go build -o "${CLIENTGEN}" ${CODEGEN_PKG}/cmd/client-gen PREFIX=k8s.io/apiextensions-apiserver/pkg/apis INPUT_BASE="--input-base ${PREFIX}" @@ -58,7 +58,7 @@ ${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiextensions/v1 echo "Building lister-gen" listergen="${PWD}/lister-gen" -go build -o "${listergen}" ${KUBEGEN_PKG}/cmd/lister-gen +go build -o "${listergen}" ${CODEGEN_PKG}/cmd/lister-gen 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" @@ -67,7 +67,7 @@ ${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${SCRIPT_BASE} echo "Building informer-gen" informergen="${PWD}/informer-gen" -go build -o "${informergen}" ${KUBEGEN_PKG}/cmd/informer-gen +go build -o "${informergen}" ${CODEGEN_PKG}/cmd/informer-gen ${informergen} \ --output-base ${SCRIPT_BASE} \ diff --git a/staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD b/staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD index 831606ed3be..3bf4ebc13b6 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD @@ -33,7 +33,7 @@ go_genrule( "string.go", ], cmd = """ -$(location //vendor/k8s.io/kube-gen/cmd/set-gen) \ +$(location //vendor/k8s.io/code-generator/cmd/set-gen) \ --input-dirs ./vendor/k8s.io/apimachinery/pkg/util/sets/types \ --output-base $$(dirname $$(dirname $(location :byte.go))) \ --go-header-file $(location //hack/boilerplate:boilerplate.go.txt) \ @@ -43,7 +43,7 @@ $(location //vendor/k8s.io/kube-gen/cmd/set-gen) \ "//vendor/k8s.io/apimachinery/pkg/util/sets/types:go_default_library", ], tools = [ - "//vendor/k8s.io/kube-gen/cmd/set-gen", + "//vendor/k8s.io/code-generator/cmd/set-gen", ], ) diff --git a/staging/src/k8s.io/apimachinery/pkg/util/sets/types/types.go b/staging/src/k8s.io/apimachinery/pkg/util/sets/types/types.go index f7a280ec77f..801498ad7d8 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/sets/types/types.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/sets/types/types.go @@ -16,7 +16,7 @@ limitations under the License. // Package types just provides input types to the set generator. It also // contains a "go generate" block. -// (You must first `go install k8s.io/kube-gen/cmd/set-gen`) +// (You must first `go install k8s.io/code-generator/cmd/set-gen`) package types //go:generate set-gen -i k8s.io/kubernetes/pkg/util/sets/types diff --git a/staging/src/k8s.io/code-generator/Godeps/Godeps.json b/staging/src/k8s.io/code-generator/Godeps/Godeps.json index 3e5428dd33f..27edd8a3bb4 100644 --- a/staging/src/k8s.io/code-generator/Godeps/Godeps.json +++ b/staging/src/k8s.io/code-generator/Godeps/Godeps.json @@ -1,5 +1,5 @@ { - "ImportPath": "k8s.io/kube-gen", + "ImportPath": "k8s.io/code-generator", "GoVersion": "go1.8", "GodepVersion": "v79", "Packages": [ diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/BUILD b/staging/src/k8s.io/code-generator/cmd/client-gen/BUILD index 74864e5d484..cef09f76bb4 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/BUILD +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/BUILD @@ -17,10 +17,10 @@ go_library( deps = [ "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/args:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/generators:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/types:go_default_library", "//vendor/k8s.io/gengo/args:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/args:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/generators:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library", ], ) @@ -35,10 +35,10 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//staging/src/k8s.io/kube-gen/cmd/client-gen/args:all-srcs", - "//staging/src/k8s.io/kube-gen/cmd/client-gen/generators:all-srcs", - "//staging/src/k8s.io/kube-gen/cmd/client-gen/path:all-srcs", - "//staging/src/k8s.io/kube-gen/cmd/client-gen/types:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/client-gen/args:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/client-gen/generators:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/client-gen/path:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/client-gen/types:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/README.md b/staging/src/k8s.io/code-generator/cmd/client-gen/README.md index 4ed196e6294..d1d67abdf98 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/README.md +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/README.md @@ -1,4 +1,4 @@ See [generating-clientset.md](https://git.k8s.io/community/contributors/devel/generating-clientset.md) -[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/staging/src/k8s.io/kube-gen/client-gen/README.md?pixel)]() +[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/staging/src/k8s.io/code-generator/client-gen/README.md?pixel)]() diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/args/BUILD b/staging/src/k8s.io/code-generator/cmd/client-gen/args/BUILD index 6d7d6df7d58..313e268d6f5 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/args/BUILD +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/args/BUILD @@ -8,7 +8,7 @@ load( go_library( name = "go_default_library", srcs = ["args.go"], - deps = ["//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library"], + deps = ["//vendor/k8s.io/code-generator/cmd/client-gen/types:go_default_library"], ) filegroup( diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/args/args.go b/staging/src/k8s.io/code-generator/cmd/client-gen/args/args.go index 29dc92c9cd0..d454cc12c71 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/args/args.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/args/args.go @@ -16,7 +16,7 @@ limitations under the License. package args -import "k8s.io/kube-gen/cmd/client-gen/types" +import "k8s.io/code-generator/cmd/client-gen/types" // ClientGenArgs is a wrapper for arguments to client-gen. type Args struct { diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/BUILD b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/BUILD index 95ac5eb716a..33dad2e7423 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/BUILD +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/BUILD @@ -17,16 +17,16 @@ go_library( ], deps = [ "//vendor/github.com/golang/glog:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/args:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/generators/fake:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/generators/scheme:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/generators/util:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/path:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/types:go_default_library", "//vendor/k8s.io/gengo/args:go_default_library", "//vendor/k8s.io/gengo/generator:go_default_library", "//vendor/k8s.io/gengo/namer:go_default_library", "//vendor/k8s.io/gengo/types:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/args:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/generators/fake:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/generators/scheme:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/generators/util:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/path:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library", ], ) @@ -41,9 +41,9 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake:all-srcs", - "//staging/src/k8s.io/kube-gen/cmd/client-gen/generators/scheme:all-srcs", - "//staging/src/k8s.io/kube-gen/cmd/client-gen/generators/util:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/client-gen/generators/util:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go index c80019cdd0b..e0d958fbf62 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go @@ -22,16 +22,16 @@ import ( "path/filepath" "strings" + clientgenargs "k8s.io/code-generator/cmd/client-gen/args" + "k8s.io/code-generator/cmd/client-gen/generators/fake" + "k8s.io/code-generator/cmd/client-gen/generators/scheme" + "k8s.io/code-generator/cmd/client-gen/generators/util" + "k8s.io/code-generator/cmd/client-gen/path" + clientgentypes "k8s.io/code-generator/cmd/client-gen/types" "k8s.io/gengo/args" "k8s.io/gengo/generator" "k8s.io/gengo/namer" "k8s.io/gengo/types" - clientgenargs "k8s.io/kube-gen/cmd/client-gen/args" - "k8s.io/kube-gen/cmd/client-gen/generators/fake" - "k8s.io/kube-gen/cmd/client-gen/generators/scheme" - "k8s.io/kube-gen/cmd/client-gen/generators/util" - "k8s.io/kube-gen/cmd/client-gen/path" - clientgentypes "k8s.io/kube-gen/cmd/client-gen/types" "github.com/golang/glog" ) diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/BUILD b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/BUILD index 71dd9a18bed..aed87e7bacb 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/BUILD +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/BUILD @@ -14,14 +14,14 @@ go_library( "generator_fake_for_type.go", ], deps = [ + "//vendor/k8s.io/code-generator/cmd/client-gen/args:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/generators/scheme:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/generators/util:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/path:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/types:go_default_library", "//vendor/k8s.io/gengo/generator:go_default_library", "//vendor/k8s.io/gengo/namer:go_default_library", "//vendor/k8s.io/gengo/types:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/args:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/generators/scheme:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/generators/util:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/path:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/fake_client_generator.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/fake_client_generator.go index 36e51f411b2..9b607fdb35c 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/fake_client_generator.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/fake_client_generator.go @@ -23,10 +23,10 @@ import ( "k8s.io/gengo/generator" "k8s.io/gengo/types" - clientgenargs "k8s.io/kube-gen/cmd/client-gen/args" - scheme "k8s.io/kube-gen/cmd/client-gen/generators/scheme" - "k8s.io/kube-gen/cmd/client-gen/generators/util" - clientgentypes "k8s.io/kube-gen/cmd/client-gen/types" + clientgenargs "k8s.io/code-generator/cmd/client-gen/args" + scheme "k8s.io/code-generator/cmd/client-gen/generators/scheme" + "k8s.io/code-generator/cmd/client-gen/generators/util" + clientgentypes "k8s.io/code-generator/cmd/client-gen/types" ) func PackageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clientsetPackage string, inputPackage string, boilerplate []byte, generatedBy string) generator.Package { diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_clientset.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_clientset.go index 665c88a583e..aa2d3b8dbe6 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_clientset.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_clientset.go @@ -22,10 +22,10 @@ import ( "path/filepath" "strings" + clientgentypes "k8s.io/code-generator/cmd/client-gen/types" "k8s.io/gengo/generator" "k8s.io/gengo/namer" "k8s.io/gengo/types" - clientgentypes "k8s.io/kube-gen/cmd/client-gen/types" ) // genClientset generates a package for a clientset. diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_group.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_group.go index 092321b93bb..31f49c6131a 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_group.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_group.go @@ -26,7 +26,7 @@ import ( "k8s.io/gengo/namer" "k8s.io/gengo/types" - "k8s.io/kube-gen/cmd/client-gen/generators/util" + "k8s.io/code-generator/cmd/client-gen/generators/util" ) // genFakeForGroup produces a file for a group client, e.g. ExtensionsClient for the extension group. diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_type.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_type.go index a6660440549..d606434da1e 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_type.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_type.go @@ -24,8 +24,8 @@ import ( "k8s.io/gengo/namer" "k8s.io/gengo/types" - "k8s.io/kube-gen/cmd/client-gen/generators/util" - "k8s.io/kube-gen/cmd/client-gen/path" + "k8s.io/code-generator/cmd/client-gen/generators/util" + "k8s.io/code-generator/cmd/client-gen/path" ) // genFakeForType produces a file for each top-level type. diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_clientset.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_clientset.go index 174cb65cb78..1b8c7e4a8b2 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_clientset.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_clientset.go @@ -22,10 +22,10 @@ import ( "path/filepath" "strings" + clientgentypes "k8s.io/code-generator/cmd/client-gen/types" "k8s.io/gengo/generator" "k8s.io/gengo/namer" "k8s.io/gengo/types" - clientgentypes "k8s.io/kube-gen/cmd/client-gen/types" ) // genClientset generates a package for a clientset. diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go index 213796781a5..d1fda0c8d88 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go @@ -24,8 +24,8 @@ import ( "k8s.io/gengo/namer" "k8s.io/gengo/types" - "k8s.io/kube-gen/cmd/client-gen/generators/util" - "k8s.io/kube-gen/cmd/client-gen/path" + "k8s.io/code-generator/cmd/client-gen/generators/util" + "k8s.io/code-generator/cmd/client-gen/path" ) // genGroup produces a file for a group client, e.g. ExtensionsClient for the extension group. diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_type.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_type.go index 8467a0ba4c1..17eea6c215b 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_type.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_type.go @@ -25,7 +25,7 @@ import ( "k8s.io/gengo/namer" "k8s.io/gengo/types" - "k8s.io/kube-gen/cmd/client-gen/generators/util" + "k8s.io/code-generator/cmd/client-gen/generators/util" ) // genClientForType produces a file for each top-level type. diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme/BUILD b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme/BUILD index 850b30ad27b..8696abc69b2 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme/BUILD +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme/BUILD @@ -9,11 +9,11 @@ go_library( name = "go_default_library", srcs = ["generator_for_scheme.go"], deps = [ + "//vendor/k8s.io/code-generator/cmd/client-gen/path:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/types:go_default_library", "//vendor/k8s.io/gengo/generator:go_default_library", "//vendor/k8s.io/gengo/namer:go_default_library", "//vendor/k8s.io/gengo/types:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/path:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme/generator_for_scheme.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme/generator_for_scheme.go index d703024d683..9c02d15c8a2 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme/generator_for_scheme.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme/generator_for_scheme.go @@ -23,11 +23,11 @@ import ( "path/filepath" "strings" + "k8s.io/code-generator/cmd/client-gen/path" + clientgentypes "k8s.io/code-generator/cmd/client-gen/types" "k8s.io/gengo/generator" "k8s.io/gengo/namer" "k8s.io/gengo/types" - "k8s.io/kube-gen/cmd/client-gen/path" - clientgentypes "k8s.io/kube-gen/cmd/client-gen/types" ) // GenScheme produces a package for a clientset with the scheme, codecs and parameter codecs. diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/main.go b/staging/src/k8s.io/code-generator/cmd/client-gen/main.go index bd1e46cea43..2bbb98b75c9 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/main.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/main.go @@ -23,10 +23,10 @@ import ( "sort" "strings" + clientgenargs "k8s.io/code-generator/cmd/client-gen/args" + "k8s.io/code-generator/cmd/client-gen/generators" + "k8s.io/code-generator/cmd/client-gen/types" "k8s.io/gengo/args" - clientgenargs "k8s.io/kube-gen/cmd/client-gen/args" - "k8s.io/kube-gen/cmd/client-gen/generators" - "k8s.io/kube-gen/cmd/client-gen/types" "github.com/golang/glog" flag "github.com/spf13/pflag" diff --git a/staging/src/k8s.io/code-generator/cmd/conversion-gen/BUILD b/staging/src/k8s.io/code-generator/cmd/conversion-gen/BUILD index fea52467213..399ca9a0bbf 100644 --- a/staging/src/k8s.io/code-generator/cmd/conversion-gen/BUILD +++ b/staging/src/k8s.io/code-generator/cmd/conversion-gen/BUILD @@ -17,8 +17,8 @@ go_library( deps = [ "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", + "//vendor/k8s.io/code-generator/cmd/conversion-gen/generators:go_default_library", "//vendor/k8s.io/gengo/args:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/conversion-gen/generators:go_default_library", ], ) @@ -33,7 +33,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/conversion-gen/generators:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/code-generator/cmd/conversion-gen/main.go b/staging/src/k8s.io/code-generator/cmd/conversion-gen/main.go index 031c7d6d763..bff32468299 100644 --- a/staging/src/k8s.io/code-generator/cmd/conversion-gen/main.go +++ b/staging/src/k8s.io/code-generator/cmd/conversion-gen/main.go @@ -37,8 +37,8 @@ package main import ( "path/filepath" + "k8s.io/code-generator/cmd/conversion-gen/generators" "k8s.io/gengo/args" - "k8s.io/kube-gen/cmd/conversion-gen/generators" "github.com/golang/glog" "github.com/spf13/pflag" diff --git a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/BUILD b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/BUILD index 2cbc76dd291..d4d92238e2b 100644 --- a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/BUILD +++ b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/BUILD @@ -16,7 +16,7 @@ go_library( srcs = ["main.go"], deps = [ "//vendor/github.com/spf13/pflag:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf:go_default_library", + "//vendor/k8s.io/code-generator/cmd/go-to-protobuf/protobuf:go_default_library", ], ) @@ -31,8 +31,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf:all-srcs", - "//staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protoc-gen-gogo:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/main.go b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/main.go index e9b11d2a4fa..8a727193901 100644 --- a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/main.go +++ b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/main.go @@ -19,7 +19,7 @@ limitations under the License. package main import ( - "k8s.io/kube-gen/cmd/go-to-protobuf/protobuf" + "k8s.io/code-generator/cmd/go-to-protobuf/protobuf" flag "github.com/spf13/pflag" ) diff --git a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/BUILD b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/BUILD index 3d115ba2772..dfa9f43b5ba 100644 --- a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/BUILD +++ b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/BUILD @@ -20,12 +20,12 @@ go_library( deps = [ "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", + "//vendor/k8s.io/code-generator/third_party/forked/golang/reflect:go_default_library", "//vendor/k8s.io/gengo/args:go_default_library", "//vendor/k8s.io/gengo/generator:go_default_library", "//vendor/k8s.io/gengo/namer:go_default_library", "//vendor/k8s.io/gengo/parser:go_default_library", "//vendor/k8s.io/gengo/types:go_default_library", - "//vendor/k8s.io/kube-gen/third_party/forked/golang/reflect:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/parser.go b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/parser.go index ffa8347d19c..305b718edb5 100644 --- a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/parser.go +++ b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/parser.go @@ -30,7 +30,7 @@ import ( "reflect" "strings" - customreflect "k8s.io/kube-gen/third_party/forked/golang/reflect" + customreflect "k8s.io/code-generator/third_party/forked/golang/reflect" ) func rewriteFile(name string, header []byte, rewriteFn func(*token.FileSet, *ast.File) error) error { diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/BUILD b/staging/src/k8s.io/code-generator/cmd/informer-gen/BUILD index df7ee1a6d24..5ed46f2b84d 100644 --- a/staging/src/k8s.io/code-generator/cmd/informer-gen/BUILD +++ b/staging/src/k8s.io/code-generator/cmd/informer-gen/BUILD @@ -17,8 +17,8 @@ go_library( deps = [ "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", + "//vendor/k8s.io/code-generator/cmd/informer-gen/generators:go_default_library", "//vendor/k8s.io/gengo/args:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/informer-gen/generators:go_default_library", ], ) @@ -33,7 +33,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//staging/src/k8s.io/kube-gen/cmd/informer-gen/generators:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/informer-gen/generators:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/BUILD b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/BUILD index 1f56383d0fa..a582ad757e9 100644 --- a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/BUILD +++ b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/BUILD @@ -22,12 +22,12 @@ go_library( deps = [ "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/generators/util:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/types:go_default_library", "//vendor/k8s.io/gengo/args:go_default_library", "//vendor/k8s.io/gengo/generator:go_default_library", "//vendor/k8s.io/gengo/namer:go_default_library", "//vendor/k8s.io/gengo/types:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/generators/util:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/factory.go b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/factory.go index ffba1944885..16f733506e5 100644 --- a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/factory.go +++ b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/factory.go @@ -19,10 +19,10 @@ package generators import ( "io" + clientgentypes "k8s.io/code-generator/cmd/client-gen/types" "k8s.io/gengo/generator" "k8s.io/gengo/namer" "k8s.io/gengo/types" - clientgentypes "k8s.io/kube-gen/cmd/client-gen/types" "github.com/golang/glog" ) diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/generic.go b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/generic.go index d3c161e1812..4054b577d43 100644 --- a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/generic.go +++ b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/generic.go @@ -21,10 +21,10 @@ import ( "sort" "strings" + clientgentypes "k8s.io/code-generator/cmd/client-gen/types" "k8s.io/gengo/generator" "k8s.io/gengo/namer" "k8s.io/gengo/types" - clientgentypes "k8s.io/kube-gen/cmd/client-gen/types" ) // genericGenerator generates the generic informer. diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/groupinterface.go b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/groupinterface.go index 2d2c9b3b7bd..bc6468ea575 100644 --- a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/groupinterface.go +++ b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/groupinterface.go @@ -21,10 +21,10 @@ import ( "path/filepath" "strings" + clientgentypes "k8s.io/code-generator/cmd/client-gen/types" "k8s.io/gengo/generator" "k8s.io/gengo/namer" "k8s.io/gengo/types" - clientgentypes "k8s.io/kube-gen/cmd/client-gen/types" ) // groupInterfaceGenerator generates the per-group interface file. diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/informer.go b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/informer.go index ea93bc828ca..939d271fa38 100644 --- a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/informer.go +++ b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/informer.go @@ -25,8 +25,8 @@ import ( "k8s.io/gengo/namer" "k8s.io/gengo/types" - "k8s.io/kube-gen/cmd/client-gen/generators/util" - clientgentypes "k8s.io/kube-gen/cmd/client-gen/types" + "k8s.io/code-generator/cmd/client-gen/generators/util" + clientgentypes "k8s.io/code-generator/cmd/client-gen/types" "github.com/golang/glog" ) diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/packages.go b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/packages.go index 08d3caa810c..593e56a2b5f 100644 --- a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/packages.go +++ b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/packages.go @@ -26,8 +26,8 @@ import ( "k8s.io/gengo/namer" "k8s.io/gengo/types" - "k8s.io/kube-gen/cmd/client-gen/generators/util" - clientgentypes "k8s.io/kube-gen/cmd/client-gen/types" + "k8s.io/code-generator/cmd/client-gen/generators/util" + clientgentypes "k8s.io/code-generator/cmd/client-gen/types" "github.com/golang/glog" ) diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/main.go b/staging/src/k8s.io/code-generator/cmd/informer-gen/main.go index 2f946b82902..00d4eae2b88 100644 --- a/staging/src/k8s.io/code-generator/cmd/informer-gen/main.go +++ b/staging/src/k8s.io/code-generator/cmd/informer-gen/main.go @@ -19,8 +19,8 @@ package main import ( "path/filepath" + "k8s.io/code-generator/cmd/informer-gen/generators" "k8s.io/gengo/args" - "k8s.io/kube-gen/cmd/informer-gen/generators" "github.com/golang/glog" "github.com/spf13/pflag" diff --git a/staging/src/k8s.io/code-generator/cmd/lister-gen/BUILD b/staging/src/k8s.io/code-generator/cmd/lister-gen/BUILD index 292dab89b7f..12235364c44 100644 --- a/staging/src/k8s.io/code-generator/cmd/lister-gen/BUILD +++ b/staging/src/k8s.io/code-generator/cmd/lister-gen/BUILD @@ -17,8 +17,8 @@ go_library( deps = [ "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", + "//vendor/k8s.io/code-generator/cmd/lister-gen/generators:go_default_library", "//vendor/k8s.io/gengo/args:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/lister-gen/generators:go_default_library", ], ) @@ -33,7 +33,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//staging/src/k8s.io/kube-gen/cmd/lister-gen/generators:all-srcs", + "//staging/src/k8s.io/code-generator/cmd/lister-gen/generators:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/BUILD b/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/BUILD index 0d1b4865e36..088e7098b15 100644 --- a/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/BUILD +++ b/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/BUILD @@ -14,12 +14,12 @@ go_library( ], deps = [ "//vendor/github.com/golang/glog:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/generators/util:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/types:go_default_library", "//vendor/k8s.io/gengo/args:go_default_library", "//vendor/k8s.io/gengo/generator:go_default_library", "//vendor/k8s.io/gengo/namer:go_default_library", "//vendor/k8s.io/gengo/types:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/generators/util:go_default_library", - "//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/expansion.go b/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/expansion.go index c091982d196..984368464cf 100644 --- a/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/expansion.go +++ b/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/expansion.go @@ -25,7 +25,7 @@ import ( "k8s.io/gengo/generator" "k8s.io/gengo/types" - "k8s.io/kube-gen/cmd/client-gen/generators/util" + "k8s.io/code-generator/cmd/client-gen/generators/util" ) // expansionGenerator produces a file for a expansion interfaces. diff --git a/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go b/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go index e2e0e75f718..9466e3cb07d 100644 --- a/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go +++ b/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go @@ -27,8 +27,8 @@ import ( "k8s.io/gengo/namer" "k8s.io/gengo/types" - "k8s.io/kube-gen/cmd/client-gen/generators/util" - clientgentypes "k8s.io/kube-gen/cmd/client-gen/types" + "k8s.io/code-generator/cmd/client-gen/generators/util" + clientgentypes "k8s.io/code-generator/cmd/client-gen/types" "github.com/golang/glog" ) diff --git a/staging/src/k8s.io/code-generator/cmd/lister-gen/main.go b/staging/src/k8s.io/code-generator/cmd/lister-gen/main.go index 4af9d97b32b..1be54d74716 100644 --- a/staging/src/k8s.io/code-generator/cmd/lister-gen/main.go +++ b/staging/src/k8s.io/code-generator/cmd/lister-gen/main.go @@ -19,8 +19,8 @@ package main import ( "path/filepath" + "k8s.io/code-generator/cmd/lister-gen/generators" "k8s.io/gengo/args" - "k8s.io/kube-gen/cmd/lister-gen/generators" "github.com/golang/glog" "github.com/spf13/pflag" diff --git a/staging/src/k8s.io/code-generator/hack/update-codegen.sh b/staging/src/k8s.io/code-generator/hack/update-codegen.sh index f2a650d3284..2913e035b3e 100755 --- a/staging/src/k8s.io/code-generator/hack/update-codegen.sh +++ b/staging/src/k8s.io/code-generator/hack/update-codegen.sh @@ -18,10 +18,10 @@ set -o errexit set -o nounset set -o pipefail -SCRIPT_PACKAGE=k8s.io/kube-gen +SCRIPT_PACKAGE=k8s.io/code-generator SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/.. SCRIPT_BASE=${SCRIPT_ROOT}/../.. -KUBEGEN_PKG=${KUBEGEN_PKG:-$(ls -d -1 ./vendor/k8s.io/kube-gen 2>/dev/null || echo "k8s.io/kube-gen")} +CODEGEN_PKG=${CODEGEN_PKG:-$(ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo "k8s.io/code-generator")} clientgen="${PWD}/client-gen-binary" listergen="${PWD}/lister-gen" @@ -47,20 +47,20 @@ function generate_group() { ) echo "Building client-gen" - go build -o "${clientgen}" ${KUBEGEN_PKG}/cmd/client-gen + go build -o "${clientgen}" ${CODEGEN_PKG}/cmd/client-gen echo "generating clientset for group ${GROUP_NAME} and version ${VERSION} at ${SCRIPT_BASE}/${CLIENT_PKG}" ${clientgen} --clientset-name="internal" --input-base ${APIS_PKG} --input ${INPUT_APIS[@]} --clientset-path ${CLIENT_PKG} --output-base=${SCRIPT_BASE} ${clientgen} --clientset-name="versioned" --input-base ${APIS_PKG} --input ${GROUP_NAME}/${VERSION} --clientset-path ${CLIENT_PKG} --output-base=${SCRIPT_BASE} echo "Building lister-gen" - go build -o "${listergen}" ${KUBEGEN_PKG}/cmd/lister-gen + go build -o "${listergen}" ${CODEGEN_PKG}/cmd/lister-gen echo "generating listers for group ${GROUP_NAME} and version ${VERSION} at ${SCRIPT_BASE}/${LISTERS_PKG}" ${listergen} --input-dirs ${APIS_PKG}/${GROUP_NAME} --input-dirs ${APIS_PKG}/${GROUP_NAME}/${VERSION} --output-package ${LISTERS_PKG} --output-base ${SCRIPT_BASE} echo "Building informer-gen" - go build -o "${informergen}" ${KUBEGEN_PKG}/cmd/informer-gen + go build -o "${informergen}" ${CODEGEN_PKG}/cmd/informer-gen echo "generating informers for group ${GROUP_NAME} and version ${VERSION} at ${SCRIPT_BASE}/${INFORMERS_PKG}" ${informergen} \ diff --git a/staging/src/k8s.io/code-generator/test/apis/testgroup/BUILD b/staging/src/k8s.io/code-generator/test/apis/testgroup/BUILD index 4f10bd63323..e7df940367a 100644 --- a/staging/src/k8s.io/code-generator/test/apis/testgroup/BUILD +++ b/staging/src/k8s.io/code-generator/test/apis/testgroup/BUILD @@ -32,8 +32,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//staging/src/k8s.io/kube-gen/test/apis/testgroup/install:all-srcs", - "//staging/src/k8s.io/kube-gen/test/apis/testgroup/v1:all-srcs", + "//staging/src/k8s.io/code-generator/test/apis/testgroup/install:all-srcs", + "//staging/src/k8s.io/code-generator/test/apis/testgroup/v1:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/code-generator/test/apis/testgroup/doc.go b/staging/src/k8s.io/code-generator/test/apis/testgroup/doc.go index 8245a703b4d..8ee98813585 100644 --- a/staging/src/k8s.io/code-generator/test/apis/testgroup/doc.go +++ b/staging/src/k8s.io/code-generator/test/apis/testgroup/doc.go @@ -16,4 +16,4 @@ limitations under the License. // +k8s:deepcopy-gen=package,register // +groupName=testgroup.k8s.io -package testgroup // import "k8s.io/kube-gen/test/apis/testgroup" +package testgroup // import "k8s.io/code-generator/test/apis/testgroup" diff --git a/staging/src/k8s.io/code-generator/test/apis/testgroup/install/BUILD b/staging/src/k8s.io/code-generator/test/apis/testgroup/install/BUILD index bff464c2a2a..06797da115f 100644 --- a/staging/src/k8s.io/code-generator/test/apis/testgroup/install/BUILD +++ b/staging/src/k8s.io/code-generator/test/apis/testgroup/install/BUILD @@ -12,8 +12,8 @@ go_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/kube-gen/test/apis/testgroup:go_default_library", - "//vendor/k8s.io/kube-gen/test/apis/testgroup/v1:go_default_library", + "//vendor/k8s.io/code-generator/test/apis/testgroup:go_default_library", + "//vendor/k8s.io/code-generator/test/apis/testgroup/v1:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/test/apis/testgroup/install/install.go b/staging/src/k8s.io/code-generator/test/apis/testgroup/install/install.go index b31f54afba7..c3178c176d1 100644 --- a/staging/src/k8s.io/code-generator/test/apis/testgroup/install/install.go +++ b/staging/src/k8s.io/code-generator/test/apis/testgroup/install/install.go @@ -22,8 +22,8 @@ import ( "k8s.io/apimachinery/pkg/apimachinery/announced" "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kube-gen/test/apis/testgroup" - "k8s.io/kube-gen/test/apis/testgroup/v1" + "k8s.io/code-generator/test/apis/testgroup" + "k8s.io/code-generator/test/apis/testgroup/v1" ) // Install registers the API group and adds types to a scheme diff --git a/staging/src/k8s.io/code-generator/test/clientset/internal/BUILD b/staging/src/k8s.io/code-generator/test/clientset/internal/BUILD index f4cc9735339..1611c9e6eaf 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/internal/BUILD +++ b/staging/src/k8s.io/code-generator/test/clientset/internal/BUILD @@ -16,7 +16,7 @@ go_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-gen/test/clientset/internal/typed/testgroup/internalversion:go_default_library", + "//vendor/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion:go_default_library", ], ) @@ -31,9 +31,9 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//staging/src/k8s.io/kube-gen/test/clientset/internal/fake:all-srcs", - "//staging/src/k8s.io/kube-gen/test/clientset/internal/scheme:all-srcs", - "//staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion:all-srcs", + "//staging/src/k8s.io/code-generator/test/clientset/internal/fake:all-srcs", + "//staging/src/k8s.io/code-generator/test/clientset/internal/scheme:all-srcs", + "//staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/code-generator/test/clientset/internal/clientset.go b/staging/src/k8s.io/code-generator/test/clientset/internal/clientset.go index 2046acba1ce..8e932a9e63f 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/internal/clientset.go +++ b/staging/src/k8s.io/code-generator/test/clientset/internal/clientset.go @@ -21,7 +21,7 @@ import ( discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" - testgroupinternalversion "k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion" + testgroupinternalversion "k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion" ) type Interface interface { diff --git a/staging/src/k8s.io/code-generator/test/clientset/internal/fake/BUILD b/staging/src/k8s.io/code-generator/test/clientset/internal/fake/BUILD index 6ef5deb74c5..7d1affdced8 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/internal/fake/BUILD +++ b/staging/src/k8s.io/code-generator/test/clientset/internal/fake/BUILD @@ -21,10 +21,10 @@ 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-gen/test/apis/testgroup:go_default_library", - "//vendor/k8s.io/kube-gen/test/clientset/internal:go_default_library", - "//vendor/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion:go_default_library", - "//vendor/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake:go_default_library", + "//vendor/k8s.io/code-generator/test/apis/testgroup:go_default_library", + "//vendor/k8s.io/code-generator/test/clientset/internal:go_default_library", + "//vendor/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion:go_default_library", + "//vendor/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/test/clientset/internal/fake/clientset_generated.go b/staging/src/k8s.io/code-generator/test/clientset/internal/fake/clientset_generated.go index 35deb3b0342..57789239115 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/internal/fake/clientset_generated.go +++ b/staging/src/k8s.io/code-generator/test/clientset/internal/fake/clientset_generated.go @@ -22,9 +22,9 @@ import ( "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" - clientset "k8s.io/kube-gen/test/clientset/internal" - testgroupinternalversion "k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion" - faketestgroupinternalversion "k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake" + clientset "k8s.io/code-generator/test/clientset/internal" + testgroupinternalversion "k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion" + faketestgroupinternalversion "k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/staging/src/k8s.io/code-generator/test/clientset/internal/fake/register.go b/staging/src/k8s.io/code-generator/test/clientset/internal/fake/register.go index 6f19bd5f25f..903aef54103 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/internal/fake/register.go +++ b/staging/src/k8s.io/code-generator/test/clientset/internal/fake/register.go @@ -21,7 +21,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" - testgroupinternalversion "k8s.io/kube-gen/test/apis/testgroup" + testgroupinternalversion "k8s.io/code-generator/test/apis/testgroup" ) var scheme = runtime.NewScheme() diff --git a/staging/src/k8s.io/code-generator/test/clientset/internal/scheme/BUILD b/staging/src/k8s.io/code-generator/test/clientset/internal/scheme/BUILD index 8d8513ff6ef..0f64934bea8 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/internal/scheme/BUILD +++ b/staging/src/k8s.io/code-generator/test/clientset/internal/scheme/BUILD @@ -18,7 +18,7 @@ go_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-gen/test/apis/testgroup/install:go_default_library", + "//vendor/k8s.io/code-generator/test/apis/testgroup/install:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/test/clientset/internal/scheme/register.go b/staging/src/k8s.io/code-generator/test/clientset/internal/scheme/register.go index 979fcc4b660..74fd8aba5d3 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/internal/scheme/register.go +++ b/staging/src/k8s.io/code-generator/test/clientset/internal/scheme/register.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" - testgroup "k8s.io/kube-gen/test/apis/testgroup/install" + testgroup "k8s.io/code-generator/test/apis/testgroup/install" os "os" ) diff --git a/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/BUILD b/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/BUILD index 85e9eebd074..8760c4c081d 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/BUILD +++ b/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/BUILD @@ -18,8 +18,8 @@ go_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-gen/test/apis/testgroup:go_default_library", - "//vendor/k8s.io/kube-gen/test/clientset/internal/scheme:go_default_library", + "//vendor/k8s.io/code-generator/test/apis/testgroup:go_default_library", + "//vendor/k8s.io/code-generator/test/clientset/internal/scheme:go_default_library", ], ) @@ -34,7 +34,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake:all-srcs", + "//staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake/BUILD b/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake/BUILD index 5ac8473e9ee..78fca5f8e06 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake/BUILD +++ b/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake/BUILD @@ -20,8 +20,8 @@ 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-gen/test/apis/testgroup:go_default_library", - "//vendor/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion:go_default_library", + "//vendor/k8s.io/code-generator/test/apis/testgroup:go_default_library", + "//vendor/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testgroup_client.go b/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testgroup_client.go index 343b2fcbd66..bc7f5370de6 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testgroup_client.go +++ b/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testgroup_client.go @@ -19,7 +19,7 @@ package fake import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - internalversion "k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion" + internalversion "k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion" ) type FakeTestgroup struct { diff --git a/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testtype.go b/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testtype.go index e7ca6ee575f..0316834a6ad 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testtype.go +++ b/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testtype.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - testgroup "k8s.io/kube-gen/test/apis/testgroup" + testgroup "k8s.io/code-generator/test/apis/testgroup" ) // FakeTestTypes implements TestTypeInterface diff --git a/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/testgroup_client.go b/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/testgroup_client.go index f511f78ecb0..8164fa83db1 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/testgroup_client.go +++ b/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/testgroup_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - "k8s.io/kube-gen/test/clientset/internal/scheme" + "k8s.io/code-generator/test/clientset/internal/scheme" ) type TestgroupInterface interface { diff --git a/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/testtype.go b/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/testtype.go index 058540a5ed7..8214543db53 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/testtype.go +++ b/staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/testtype.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - testgroup "k8s.io/kube-gen/test/apis/testgroup" - scheme "k8s.io/kube-gen/test/clientset/internal/scheme" + testgroup "k8s.io/code-generator/test/apis/testgroup" + scheme "k8s.io/code-generator/test/clientset/internal/scheme" ) // TestTypesGetter has a method to return a TestTypeInterface. diff --git a/staging/src/k8s.io/code-generator/test/clientset/versioned/BUILD b/staging/src/k8s.io/code-generator/test/clientset/versioned/BUILD index 0877e63c3ef..af738f1ec5b 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/versioned/BUILD +++ b/staging/src/k8s.io/code-generator/test/clientset/versioned/BUILD @@ -16,7 +16,7 @@ go_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-gen/test/clientset/versioned/typed/testgroup/v1:go_default_library", + "//vendor/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1:go_default_library", ], ) @@ -31,9 +31,9 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//staging/src/k8s.io/kube-gen/test/clientset/versioned/fake:all-srcs", - "//staging/src/k8s.io/kube-gen/test/clientset/versioned/scheme:all-srcs", - "//staging/src/k8s.io/kube-gen/test/clientset/versioned/typed/testgroup/v1:all-srcs", + "//staging/src/k8s.io/code-generator/test/clientset/versioned/fake:all-srcs", + "//staging/src/k8s.io/code-generator/test/clientset/versioned/scheme:all-srcs", + "//staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/code-generator/test/clientset/versioned/clientset.go b/staging/src/k8s.io/code-generator/test/clientset/versioned/clientset.go index 709bb6418e3..b304108406d 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/versioned/clientset.go +++ b/staging/src/k8s.io/code-generator/test/clientset/versioned/clientset.go @@ -21,7 +21,7 @@ import ( discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" - testgroupv1 "k8s.io/kube-gen/test/clientset/versioned/typed/testgroup/v1" + testgroupv1 "k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1" ) type Interface interface { diff --git a/staging/src/k8s.io/code-generator/test/clientset/versioned/fake/BUILD b/staging/src/k8s.io/code-generator/test/clientset/versioned/fake/BUILD index 8796fbb90a9..58bb040d3f9 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/versioned/fake/BUILD +++ b/staging/src/k8s.io/code-generator/test/clientset/versioned/fake/BUILD @@ -21,10 +21,10 @@ 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-gen/test/apis/testgroup/v1:go_default_library", - "//vendor/k8s.io/kube-gen/test/clientset/versioned:go_default_library", - "//vendor/k8s.io/kube-gen/test/clientset/versioned/typed/testgroup/v1:go_default_library", - "//vendor/k8s.io/kube-gen/test/clientset/versioned/typed/testgroup/v1/fake:go_default_library", + "//vendor/k8s.io/code-generator/test/apis/testgroup/v1:go_default_library", + "//vendor/k8s.io/code-generator/test/clientset/versioned:go_default_library", + "//vendor/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1:go_default_library", + "//vendor/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/test/clientset/versioned/fake/clientset_generated.go b/staging/src/k8s.io/code-generator/test/clientset/versioned/fake/clientset_generated.go index 3fff1dd73df..3967979b09b 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/versioned/fake/clientset_generated.go +++ b/staging/src/k8s.io/code-generator/test/clientset/versioned/fake/clientset_generated.go @@ -22,9 +22,9 @@ import ( "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" - clientset "k8s.io/kube-gen/test/clientset/versioned" - testgroupv1 "k8s.io/kube-gen/test/clientset/versioned/typed/testgroup/v1" - faketestgroupv1 "k8s.io/kube-gen/test/clientset/versioned/typed/testgroup/v1/fake" + clientset "k8s.io/code-generator/test/clientset/versioned" + testgroupv1 "k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1" + faketestgroupv1 "k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/staging/src/k8s.io/code-generator/test/clientset/versioned/fake/register.go b/staging/src/k8s.io/code-generator/test/clientset/versioned/fake/register.go index 6c680274c63..7783996446b 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/versioned/fake/register.go +++ b/staging/src/k8s.io/code-generator/test/clientset/versioned/fake/register.go @@ -21,7 +21,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" - testgroupv1 "k8s.io/kube-gen/test/apis/testgroup/v1" + testgroupv1 "k8s.io/code-generator/test/apis/testgroup/v1" ) var scheme = runtime.NewScheme() diff --git a/staging/src/k8s.io/code-generator/test/clientset/versioned/scheme/BUILD b/staging/src/k8s.io/code-generator/test/clientset/versioned/scheme/BUILD index 597a08106f3..cbe61ba2562 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/versioned/scheme/BUILD +++ b/staging/src/k8s.io/code-generator/test/clientset/versioned/scheme/BUILD @@ -16,7 +16,7 @@ go_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-gen/test/apis/testgroup/v1:go_default_library", + "//vendor/k8s.io/code-generator/test/apis/testgroup/v1:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/test/clientset/versioned/scheme/register.go b/staging/src/k8s.io/code-generator/test/clientset/versioned/scheme/register.go index f0dba060318..52f8ceb6419 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/versioned/scheme/register.go +++ b/staging/src/k8s.io/code-generator/test/clientset/versioned/scheme/register.go @@ -21,7 +21,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" - testgroupv1 "k8s.io/kube-gen/test/apis/testgroup/v1" + testgroupv1 "k8s.io/code-generator/test/apis/testgroup/v1" ) var Scheme = runtime.NewScheme() diff --git a/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/BUILD b/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/BUILD index 54c2ffbfb3e..073a2e3335e 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/BUILD +++ b/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/BUILD @@ -19,8 +19,8 @@ go_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-gen/test/apis/testgroup/v1:go_default_library", - "//vendor/k8s.io/kube-gen/test/clientset/versioned/scheme:go_default_library", + "//vendor/k8s.io/code-generator/test/apis/testgroup/v1:go_default_library", + "//vendor/k8s.io/code-generator/test/clientset/versioned/scheme:go_default_library", ], ) @@ -35,7 +35,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//staging/src/k8s.io/kube-gen/test/clientset/versioned/typed/testgroup/v1/fake:all-srcs", + "//staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake/BUILD b/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake/BUILD index c8bce9ba0cf..68255f153bd 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake/BUILD +++ b/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake/BUILD @@ -20,8 +20,8 @@ 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-gen/test/apis/testgroup/v1:go_default_library", - "//vendor/k8s.io/kube-gen/test/clientset/versioned/typed/testgroup/v1:go_default_library", + "//vendor/k8s.io/code-generator/test/apis/testgroup/v1:go_default_library", + "//vendor/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake/fake_testgroup_client.go b/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake/fake_testgroup_client.go index 871d4c2546e..3cff2ef02e3 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake/fake_testgroup_client.go +++ b/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake/fake_testgroup_client.go @@ -19,7 +19,7 @@ package fake import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1 "k8s.io/kube-gen/test/clientset/versioned/typed/testgroup/v1" + v1 "k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1" ) type FakeTestgroupV1 struct { diff --git a/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake/fake_testtype.go b/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake/fake_testtype.go index 6817ee940a0..07fd85d95d0 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake/fake_testtype.go +++ b/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake/fake_testtype.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - testgroup_v1 "k8s.io/kube-gen/test/apis/testgroup/v1" + testgroup_v1 "k8s.io/code-generator/test/apis/testgroup/v1" ) // FakeTestTypes implements TestTypeInterface diff --git a/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/testgroup_client.go b/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/testgroup_client.go index 65f4ea6d811..60233a0fc8b 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/testgroup_client.go +++ b/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/testgroup_client.go @@ -19,8 +19,8 @@ package v1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1 "k8s.io/kube-gen/test/apis/testgroup/v1" - "k8s.io/kube-gen/test/clientset/versioned/scheme" + v1 "k8s.io/code-generator/test/apis/testgroup/v1" + "k8s.io/code-generator/test/clientset/versioned/scheme" ) type TestgroupV1Interface interface { diff --git a/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/testtype.go b/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/testtype.go index a2de565395c..5fdaf5acf7a 100644 --- a/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/testtype.go +++ b/staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/testtype.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1 "k8s.io/kube-gen/test/apis/testgroup/v1" - scheme "k8s.io/kube-gen/test/clientset/versioned/scheme" + v1 "k8s.io/code-generator/test/apis/testgroup/v1" + scheme "k8s.io/code-generator/test/clientset/versioned/scheme" ) // TestTypesGetter has a method to return a TestTypeInterface. diff --git a/staging/src/k8s.io/code-generator/test/informers/externalversions/BUILD b/staging/src/k8s.io/code-generator/test/informers/externalversions/BUILD index 9f53f06c80d..238ee451f70 100644 --- a/staging/src/k8s.io/code-generator/test/informers/externalversions/BUILD +++ b/staging/src/k8s.io/code-generator/test/informers/externalversions/BUILD @@ -15,10 +15,10 @@ go_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-gen/test/apis/testgroup/v1:go_default_library", - "//vendor/k8s.io/kube-gen/test/clientset/versioned:go_default_library", - "//vendor/k8s.io/kube-gen/test/informers/externalversions/internalinterfaces:go_default_library", - "//vendor/k8s.io/kube-gen/test/informers/externalversions/testgroup:go_default_library", + "//vendor/k8s.io/code-generator/test/apis/testgroup/v1:go_default_library", + "//vendor/k8s.io/code-generator/test/clientset/versioned:go_default_library", + "//vendor/k8s.io/code-generator/test/informers/externalversions/internalinterfaces:go_default_library", + "//vendor/k8s.io/code-generator/test/informers/externalversions/testgroup:go_default_library", ], ) @@ -33,8 +33,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//staging/src/k8s.io/kube-gen/test/informers/externalversions/internalinterfaces:all-srcs", - "//staging/src/k8s.io/kube-gen/test/informers/externalversions/testgroup:all-srcs", + "//staging/src/k8s.io/code-generator/test/informers/externalversions/internalinterfaces:all-srcs", + "//staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/code-generator/test/informers/externalversions/factory.go b/staging/src/k8s.io/code-generator/test/informers/externalversions/factory.go index 69f6f12bbcb..e3635b36cae 100644 --- a/staging/src/k8s.io/code-generator/test/informers/externalversions/factory.go +++ b/staging/src/k8s.io/code-generator/test/informers/externalversions/factory.go @@ -22,9 +22,9 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - versioned "k8s.io/kube-gen/test/clientset/versioned" - internalinterfaces "k8s.io/kube-gen/test/informers/externalversions/internalinterfaces" - testgroup "k8s.io/kube-gen/test/informers/externalversions/testgroup" + versioned "k8s.io/code-generator/test/clientset/versioned" + internalinterfaces "k8s.io/code-generator/test/informers/externalversions/internalinterfaces" + testgroup "k8s.io/code-generator/test/informers/externalversions/testgroup" reflect "reflect" sync "sync" time "time" diff --git a/staging/src/k8s.io/code-generator/test/informers/externalversions/generic.go b/staging/src/k8s.io/code-generator/test/informers/externalversions/generic.go index 96e76140da6..0a74127c388 100644 --- a/staging/src/k8s.io/code-generator/test/informers/externalversions/generic.go +++ b/staging/src/k8s.io/code-generator/test/informers/externalversions/generic.go @@ -22,7 +22,7 @@ import ( "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - v1 "k8s.io/kube-gen/test/apis/testgroup/v1" + v1 "k8s.io/code-generator/test/apis/testgroup/v1" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/staging/src/k8s.io/code-generator/test/informers/externalversions/internalinterfaces/BUILD b/staging/src/k8s.io/code-generator/test/informers/externalversions/internalinterfaces/BUILD index dcdcd13360f..d84cf9726a9 100644 --- a/staging/src/k8s.io/code-generator/test/informers/externalversions/internalinterfaces/BUILD +++ b/staging/src/k8s.io/code-generator/test/informers/externalversions/internalinterfaces/BUILD @@ -11,7 +11,7 @@ go_library( deps = [ "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", - "//vendor/k8s.io/kube-gen/test/clientset/versioned:go_default_library", + "//vendor/k8s.io/code-generator/test/clientset/versioned:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/test/informers/externalversions/internalinterfaces/factory_interfaces.go b/staging/src/k8s.io/code-generator/test/informers/externalversions/internalinterfaces/factory_interfaces.go index 0365c955734..6dbb51f83dc 100644 --- a/staging/src/k8s.io/code-generator/test/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/staging/src/k8s.io/code-generator/test/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,7 +21,7 @@ package internalinterfaces import ( runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" - versioned "k8s.io/kube-gen/test/clientset/versioned" + versioned "k8s.io/code-generator/test/clientset/versioned" time "time" ) diff --git a/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/BUILD b/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/BUILD index cb8cdbf610a..88b68b58374 100644 --- a/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/BUILD +++ b/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/BUILD @@ -9,8 +9,8 @@ go_library( name = "go_default_library", srcs = ["interface.go"], deps = [ - "//vendor/k8s.io/kube-gen/test/informers/externalversions/internalinterfaces:go_default_library", - "//vendor/k8s.io/kube-gen/test/informers/externalversions/testgroup/v1:go_default_library", + "//vendor/k8s.io/code-generator/test/informers/externalversions/internalinterfaces:go_default_library", + "//vendor/k8s.io/code-generator/test/informers/externalversions/testgroup/v1:go_default_library", ], ) @@ -25,7 +25,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//staging/src/k8s.io/kube-gen/test/informers/externalversions/testgroup/v1:all-srcs", + "//staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/v1:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/interface.go b/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/interface.go index 575e0de1200..23882d106d9 100644 --- a/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/interface.go +++ b/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/interface.go @@ -19,8 +19,8 @@ limitations under the License. package testgroup import ( - internalinterfaces "k8s.io/kube-gen/test/informers/externalversions/internalinterfaces" - v1 "k8s.io/kube-gen/test/informers/externalversions/testgroup/v1" + internalinterfaces "k8s.io/code-generator/test/informers/externalversions/internalinterfaces" + v1 "k8s.io/code-generator/test/informers/externalversions/testgroup/v1" ) // Interface provides access to each of this group's versions. diff --git a/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/v1/BUILD b/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/v1/BUILD index 02608a2d6d1..435d789f82a 100644 --- a/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/v1/BUILD +++ b/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/v1/BUILD @@ -16,10 +16,10 @@ go_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-gen/test/apis/testgroup/v1:go_default_library", - "//vendor/k8s.io/kube-gen/test/clientset/versioned:go_default_library", - "//vendor/k8s.io/kube-gen/test/informers/externalversions/internalinterfaces:go_default_library", - "//vendor/k8s.io/kube-gen/test/listers/testgroup/v1:go_default_library", + "//vendor/k8s.io/code-generator/test/apis/testgroup/v1:go_default_library", + "//vendor/k8s.io/code-generator/test/clientset/versioned:go_default_library", + "//vendor/k8s.io/code-generator/test/informers/externalversions/internalinterfaces:go_default_library", + "//vendor/k8s.io/code-generator/test/listers/testgroup/v1:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/v1/interface.go b/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/v1/interface.go index 55bb003d211..7bb5a156374 100644 --- a/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/v1/interface.go +++ b/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/v1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - internalinterfaces "k8s.io/kube-gen/test/informers/externalversions/internalinterfaces" + internalinterfaces "k8s.io/code-generator/test/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/v1/testtype.go b/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/v1/testtype.go index 13349199871..0bb1e1f42ee 100644 --- a/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/v1/testtype.go +++ b/staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/v1/testtype.go @@ -23,10 +23,10 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - testgroup_v1 "k8s.io/kube-gen/test/apis/testgroup/v1" - versioned "k8s.io/kube-gen/test/clientset/versioned" - internalinterfaces "k8s.io/kube-gen/test/informers/externalversions/internalinterfaces" - v1 "k8s.io/kube-gen/test/listers/testgroup/v1" + testgroup_v1 "k8s.io/code-generator/test/apis/testgroup/v1" + versioned "k8s.io/code-generator/test/clientset/versioned" + internalinterfaces "k8s.io/code-generator/test/informers/externalversions/internalinterfaces" + v1 "k8s.io/code-generator/test/listers/testgroup/v1" time "time" ) diff --git a/staging/src/k8s.io/code-generator/test/informers/internalversion/BUILD b/staging/src/k8s.io/code-generator/test/informers/internalversion/BUILD index 5c6fc023be9..c86eb600579 100644 --- a/staging/src/k8s.io/code-generator/test/informers/internalversion/BUILD +++ b/staging/src/k8s.io/code-generator/test/informers/internalversion/BUILD @@ -15,10 +15,10 @@ go_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-gen/test/apis/testgroup:go_default_library", - "//vendor/k8s.io/kube-gen/test/clientset/internal:go_default_library", - "//vendor/k8s.io/kube-gen/test/informers/internalversion/internalinterfaces:go_default_library", - "//vendor/k8s.io/kube-gen/test/informers/internalversion/testgroup:go_default_library", + "//vendor/k8s.io/code-generator/test/apis/testgroup:go_default_library", + "//vendor/k8s.io/code-generator/test/clientset/internal:go_default_library", + "//vendor/k8s.io/code-generator/test/informers/internalversion/internalinterfaces:go_default_library", + "//vendor/k8s.io/code-generator/test/informers/internalversion/testgroup:go_default_library", ], ) @@ -33,8 +33,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//staging/src/k8s.io/kube-gen/test/informers/internalversion/internalinterfaces:all-srcs", - "//staging/src/k8s.io/kube-gen/test/informers/internalversion/testgroup:all-srcs", + "//staging/src/k8s.io/code-generator/test/informers/internalversion/internalinterfaces:all-srcs", + "//staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/code-generator/test/informers/internalversion/factory.go b/staging/src/k8s.io/code-generator/test/informers/internalversion/factory.go index 3169e32837f..be67ac386ce 100644 --- a/staging/src/k8s.io/code-generator/test/informers/internalversion/factory.go +++ b/staging/src/k8s.io/code-generator/test/informers/internalversion/factory.go @@ -22,9 +22,9 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - internal "k8s.io/kube-gen/test/clientset/internal" - internalinterfaces "k8s.io/kube-gen/test/informers/internalversion/internalinterfaces" - testgroup "k8s.io/kube-gen/test/informers/internalversion/testgroup" + internal "k8s.io/code-generator/test/clientset/internal" + internalinterfaces "k8s.io/code-generator/test/informers/internalversion/internalinterfaces" + testgroup "k8s.io/code-generator/test/informers/internalversion/testgroup" reflect "reflect" sync "sync" time "time" diff --git a/staging/src/k8s.io/code-generator/test/informers/internalversion/generic.go b/staging/src/k8s.io/code-generator/test/informers/internalversion/generic.go index d5fd7f572c0..fda81fd6753 100644 --- a/staging/src/k8s.io/code-generator/test/informers/internalversion/generic.go +++ b/staging/src/k8s.io/code-generator/test/informers/internalversion/generic.go @@ -22,7 +22,7 @@ import ( "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - testgroup "k8s.io/kube-gen/test/apis/testgroup" + testgroup "k8s.io/code-generator/test/apis/testgroup" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/staging/src/k8s.io/code-generator/test/informers/internalversion/internalinterfaces/BUILD b/staging/src/k8s.io/code-generator/test/informers/internalversion/internalinterfaces/BUILD index a2c85578479..ca82011c200 100644 --- a/staging/src/k8s.io/code-generator/test/informers/internalversion/internalinterfaces/BUILD +++ b/staging/src/k8s.io/code-generator/test/informers/internalversion/internalinterfaces/BUILD @@ -11,7 +11,7 @@ go_library( deps = [ "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", - "//vendor/k8s.io/kube-gen/test/clientset/internal:go_default_library", + "//vendor/k8s.io/code-generator/test/clientset/internal:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/test/informers/internalversion/internalinterfaces/factory_interfaces.go b/staging/src/k8s.io/code-generator/test/informers/internalversion/internalinterfaces/factory_interfaces.go index 4be066e829d..96331a169b9 100644 --- a/staging/src/k8s.io/code-generator/test/informers/internalversion/internalinterfaces/factory_interfaces.go +++ b/staging/src/k8s.io/code-generator/test/informers/internalversion/internalinterfaces/factory_interfaces.go @@ -21,7 +21,7 @@ package internalinterfaces import ( runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" - internal "k8s.io/kube-gen/test/clientset/internal" + internal "k8s.io/code-generator/test/clientset/internal" time "time" ) diff --git a/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/BUILD b/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/BUILD index a248c9e4ae1..f9c7a84ce89 100644 --- a/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/BUILD +++ b/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/BUILD @@ -9,8 +9,8 @@ go_library( name = "go_default_library", srcs = ["interface.go"], deps = [ - "//vendor/k8s.io/kube-gen/test/informers/internalversion/internalinterfaces:go_default_library", - "//vendor/k8s.io/kube-gen/test/informers/internalversion/testgroup/internalversion:go_default_library", + "//vendor/k8s.io/code-generator/test/informers/internalversion/internalinterfaces:go_default_library", + "//vendor/k8s.io/code-generator/test/informers/internalversion/testgroup/internalversion:go_default_library", ], ) @@ -25,7 +25,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//staging/src/k8s.io/kube-gen/test/informers/internalversion/testgroup/internalversion:all-srcs", + "//staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/internalversion:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/interface.go b/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/interface.go index 85975e32732..48a3be5ae7b 100644 --- a/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/interface.go +++ b/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/interface.go @@ -19,8 +19,8 @@ limitations under the License. package testgroup import ( - internalinterfaces "k8s.io/kube-gen/test/informers/internalversion/internalinterfaces" - internalversion "k8s.io/kube-gen/test/informers/internalversion/testgroup/internalversion" + internalinterfaces "k8s.io/code-generator/test/informers/internalversion/internalinterfaces" + internalversion "k8s.io/code-generator/test/informers/internalversion/testgroup/internalversion" ) // Interface provides access to each of this group's versions. diff --git a/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/internalversion/BUILD b/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/internalversion/BUILD index ce07c449373..3b5924ca6ef 100644 --- a/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/internalversion/BUILD +++ b/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/internalversion/BUILD @@ -16,10 +16,10 @@ go_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-gen/test/apis/testgroup:go_default_library", - "//vendor/k8s.io/kube-gen/test/clientset/internal:go_default_library", - "//vendor/k8s.io/kube-gen/test/informers/internalversion/internalinterfaces:go_default_library", - "//vendor/k8s.io/kube-gen/test/listers/testgroup/internalversion:go_default_library", + "//vendor/k8s.io/code-generator/test/apis/testgroup:go_default_library", + "//vendor/k8s.io/code-generator/test/clientset/internal:go_default_library", + "//vendor/k8s.io/code-generator/test/informers/internalversion/internalinterfaces:go_default_library", + "//vendor/k8s.io/code-generator/test/listers/testgroup/internalversion:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/internalversion/interface.go b/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/internalversion/interface.go index b96b634e7c9..3d3d5d3483a 100644 --- a/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/internalversion/interface.go +++ b/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/internalversion/interface.go @@ -19,7 +19,7 @@ limitations under the License. package internalversion import ( - internalinterfaces "k8s.io/kube-gen/test/informers/internalversion/internalinterfaces" + internalinterfaces "k8s.io/code-generator/test/informers/internalversion/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/internalversion/testtype.go b/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/internalversion/testtype.go index 7ba7728cba3..2b41de2f796 100644 --- a/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/internalversion/testtype.go +++ b/staging/src/k8s.io/code-generator/test/informers/internalversion/testgroup/internalversion/testtype.go @@ -23,10 +23,10 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - testgroup "k8s.io/kube-gen/test/apis/testgroup" - internal "k8s.io/kube-gen/test/clientset/internal" - internalinterfaces "k8s.io/kube-gen/test/informers/internalversion/internalinterfaces" - internalversion "k8s.io/kube-gen/test/listers/testgroup/internalversion" + testgroup "k8s.io/code-generator/test/apis/testgroup" + internal "k8s.io/code-generator/test/clientset/internal" + internalinterfaces "k8s.io/code-generator/test/informers/internalversion/internalinterfaces" + internalversion "k8s.io/code-generator/test/listers/testgroup/internalversion" time "time" ) diff --git a/staging/src/k8s.io/code-generator/test/listers/testgroup/internalversion/BUILD b/staging/src/k8s.io/code-generator/test/listers/testgroup/internalversion/BUILD index c75646056a7..c68ae5da550 100644 --- a/staging/src/k8s.io/code-generator/test/listers/testgroup/internalversion/BUILD +++ b/staging/src/k8s.io/code-generator/test/listers/testgroup/internalversion/BUILD @@ -15,7 +15,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/api/errors: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-gen/test/apis/testgroup:go_default_library", + "//vendor/k8s.io/code-generator/test/apis/testgroup:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/test/listers/testgroup/internalversion/testtype.go b/staging/src/k8s.io/code-generator/test/listers/testgroup/internalversion/testtype.go index 90378b025d7..bf4af4492e1 100644 --- a/staging/src/k8s.io/code-generator/test/listers/testgroup/internalversion/testtype.go +++ b/staging/src/k8s.io/code-generator/test/listers/testgroup/internalversion/testtype.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - testgroup "k8s.io/kube-gen/test/apis/testgroup" + testgroup "k8s.io/code-generator/test/apis/testgroup" ) // TestTypeLister helps list TestTypes. diff --git a/staging/src/k8s.io/code-generator/test/listers/testgroup/v1/BUILD b/staging/src/k8s.io/code-generator/test/listers/testgroup/v1/BUILD index f9de88d2069..4590b4eaf57 100644 --- a/staging/src/k8s.io/code-generator/test/listers/testgroup/v1/BUILD +++ b/staging/src/k8s.io/code-generator/test/listers/testgroup/v1/BUILD @@ -15,7 +15,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/api/errors: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-gen/test/apis/testgroup/v1:go_default_library", + "//vendor/k8s.io/code-generator/test/apis/testgroup/v1:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/test/listers/testgroup/v1/testtype.go b/staging/src/k8s.io/code-generator/test/listers/testgroup/v1/testtype.go index f033643c53e..37ec9a335b3 100644 --- a/staging/src/k8s.io/code-generator/test/listers/testgroup/v1/testtype.go +++ b/staging/src/k8s.io/code-generator/test/listers/testgroup/v1/testtype.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1 "k8s.io/kube-gen/test/apis/testgroup/v1" + v1 "k8s.io/code-generator/test/apis/testgroup/v1" ) // TestTypeLister helps list TestTypes. diff --git a/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh b/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh index a8b1f5c6d87..53e9889caeb 100755 --- a/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh +++ b/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh @@ -20,7 +20,7 @@ set -o pipefail SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/.. SCRIPT_BASE=${SCRIPT_ROOT}/../.. -KUBEGEN_PKG=${KUBEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/kube-gen 2>/dev/null || echo k8s.io/kube-gen)} +CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo k8s.io/code-generator)} if LANG=C sed --help 2>&1 | grep -q GNU; then SED="sed" @@ -42,7 +42,7 @@ trap cleanup EXIT echo "Building client-gen" CLIENTGEN="${PWD}/client-gen-binary" -go build -o "${CLIENTGEN}" ${KUBEGEN_PKG}/cmd/client-gen +go build -o "${CLIENTGEN}" ${CODEGEN_PKG}/cmd/client-gen PREFIX=k8s.io/kube-aggregator/pkg/apis INPUT_BASE="--input-base ${PREFIX}" @@ -59,7 +59,7 @@ ${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiregistration/ echo "Building lister-gen" listergen="${PWD}/lister-gen" -go build -o "${listergen}" ${KUBEGEN_PKG}/cmd/lister-gen +go build -o "${listergen}" ${CODEGEN_PKG}/cmd/lister-gen LISTER_INPUT="--input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1" LISTER_PATH="--output-package k8s.io/kube-aggregator/pkg/client/listers" @@ -68,7 +68,7 @@ ${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${SCRIPT_BASE} echo "Building informer-gen" informergen="${PWD}/informer-gen" -go build -o "${informergen}" ${KUBEGEN_PKG}/cmd/informer-gen +go build -o "${informergen}" ${CODEGEN_PKG}/cmd/informer-gen ${informergen} \ --output-base ${SCRIPT_BASE} \ diff --git a/staging/src/k8s.io/metrics/hack/update-codegen.sh b/staging/src/k8s.io/metrics/hack/update-codegen.sh index 09d670bb40e..72c354ccc98 100755 --- a/staging/src/k8s.io/metrics/hack/update-codegen.sh +++ b/staging/src/k8s.io/metrics/hack/update-codegen.sh @@ -20,7 +20,7 @@ set -o pipefail SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/.. SCRIPT_BASE=${SCRIPT_ROOT}/../.. -KUBEGEN_PKG=${KUBEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/kube-gen 2>/dev/null || echo k8s.io/kube-gen)} +CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo k8s.io/code-generator)} # Register function to be called on EXIT to remove generated binary. function cleanup { @@ -30,7 +30,7 @@ trap cleanup EXIT echo "Building client-gen" CLIENTGEN="${PWD}/client-gen-binary" -go build -o "${CLIENTGEN}" ${KUBEGEN_PKG}/cmd/client-gen +go build -o "${CLIENTGEN}" ${CODEGEN_PKG}/cmd/client-gen PREFIX=k8s.io/metrics/pkg/apis INPUT_BASE="--input-base ${PREFIX}" diff --git a/staging/src/k8s.io/sample-apiserver/hack/update-codegen.sh b/staging/src/k8s.io/sample-apiserver/hack/update-codegen.sh index 387447a75ee..fb717e793b2 100755 --- a/staging/src/k8s.io/sample-apiserver/hack/update-codegen.sh +++ b/staging/src/k8s.io/sample-apiserver/hack/update-codegen.sh @@ -21,7 +21,7 @@ set -o pipefail SCRIPT_PACKAGE=k8s.io/sample-apiserver SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/.. SCRIPT_BASE=${SCRIPT_ROOT}/../.. -KUBEGEN_PKG=${KUBEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/kube-gen 2>/dev/null || echo k8s.io/kube-gen)} +CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo k8s.io/code-generator)} clientgen="${PWD}/client-gen-binary" listergen="${PWD}/lister-gen" @@ -47,20 +47,20 @@ function generate_group() { ) echo "Building client-gen" - go build -o "${clientgen}" ${KUBEGEN_PKG}/cmd/client-gen + go build -o "${clientgen}" ${CODEGEN_PKG}/cmd/client-gen echo "generating clientset for group ${GROUP_NAME} and version ${VERSION} at ${SCRIPT_BASE}/${CLIENT_PKG}" ${clientgen} --input-base ${APIS_PKG} --input ${INPUT_APIS[@]} --clientset-path ${CLIENT_PKG}/clientset_generated --output-base=${SCRIPT_BASE} ${clientgen} --clientset-name="clientset" --input-base ${APIS_PKG} --input ${GROUP_NAME}/${VERSION} --clientset-path ${CLIENT_PKG}/clientset_generated --output-base=${SCRIPT_BASE} echo "Building lister-gen" - go build -o "${listergen}" ${KUBEGEN_PKG}/cmd/lister-gen + go build -o "${listergen}" ${CODEGEN_PKG}/cmd/lister-gen echo "generating listers for group ${GROUP_NAME} and version ${VERSION} at ${SCRIPT_BASE}/${LISTERS_PKG}" ${listergen} --input-dirs ${APIS_PKG}/${GROUP_NAME} --input-dirs ${APIS_PKG}/${GROUP_NAME}/${VERSION} --output-package ${LISTERS_PKG} --output-base ${SCRIPT_BASE} echo "Building informer-gen" - go build -o "${informergen}" ${KUBEGEN_PKG}/cmd/informer-gen + go build -o "${informergen}" ${CODEGEN_PKG}/cmd/informer-gen echo "generating informers for group ${GROUP_NAME} and version ${VERSION} at ${SCRIPT_BASE}/${INFORMERS_PKG}" ${informergen} \