scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-31 10:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup after k8s.io/{kube-gen -> code-generator} rename

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-08-16 15:04:52 +02:00
parent 9af3618126
commit e3a3d108fb
115 changed files with 297 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
build/root/Makefile.generated_files
View File

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

44
hack/.golint_failures
View File

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

2
hack/lib/protoc.sh
View File

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

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

@@ -39,7 +39,7 @@ function kfind() {
# include the "special" vendor directories which are actually part
# of the Kubernetes source tree - generators will use these for
# including certain core API concepts.
find -H . ./vendor/k8s.io/apimachinery ./vendor/k8s.io/apiserver ./vendor/k8s.io/kube-aggregator ./vendor/k8s.io/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 \( \
\( \

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

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

10
hack/staging-import-restrictions.json
View File

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

16
hack/update-codegen.sh
View File

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

4
hack/update-generated-protobuf-dockerized.sh
View File

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

2
hack/update-generated-runtime-dockerized.sh
View File

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

2
hack/verify-api-groups.sh
View File

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

10
hack/verify-codegen.sh
View File

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

2
hack/verify-import-boss.sh
View File

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

2
pkg/generated/openapi/BUILD
View File

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

4
pkg/generated/openapi/def.bzl
View File

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

36
staging/BUILD
View File

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

2
staging/README.md
View File

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

2
staging/prime-apimachinery.sh
View File

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

8
staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh
View File

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

4
staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD
View File

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

2
staging/src/k8s.io/apimachinery/pkg/util/sets/types/types.go
View File

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

2
staging/src/k8s.io/code-generator/Godeps/Godeps.json generated
View File

@@ -1,5 +1,5 @@
{
"ImportPath": "k8s.io/kube-gen",
"ImportPath": "k8s.io/code-generator",
"GoVersion": "go1.8",
"GodepVersion": "v79",
"Packages": [

14
staging/src/k8s.io/code-generator/cmd/client-gen/BUILD
View File

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

2
staging/src/k8s.io/code-generator/cmd/client-gen/README.md
View File

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

2
staging/src/k8s.io/code-generator/cmd/client-gen/args/BUILD
View File

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

2
staging/src/k8s.io/code-generator/cmd/client-gen/args/args.go
View File

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

18
staging/src/k8s.io/code-generator/cmd/client-gen/generators/BUILD
View File

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

12
staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go
View File

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

10
staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/BUILD
View File

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

8
staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/fake_client_generator.go
View File

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

2
staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_clientset.go
View File

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

2
staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_group.go
View File

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

4
staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_type.go
View File

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

2
staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_clientset.go
View File

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

4
staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go
View File

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

2
staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_type.go
View File

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

4
staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme/BUILD
View File

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

4
staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme/generator_for_scheme.go
View File

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

6
staging/src/k8s.io/code-generator/cmd/client-gen/main.go
View File

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

4
staging/src/k8s.io/code-generator/cmd/conversion-gen/BUILD
View File

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

2
staging/src/k8s.io/code-generator/cmd/conversion-gen/main.go
View File

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

6
staging/src/k8s.io/code-generator/cmd/go-to-protobuf/BUILD
View File

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

2
staging/src/k8s.io/code-generator/cmd/go-to-protobuf/main.go
View File

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

2
staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/BUILD
View File

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

2
staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/parser.go
View File

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

4
staging/src/k8s.io/code-generator/cmd/informer-gen/BUILD
View File

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

4
staging/src/k8s.io/code-generator/cmd/informer-gen/generators/BUILD
View File

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

2
staging/src/k8s.io/code-generator/cmd/informer-gen/generators/factory.go
View File

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

2
staging/src/k8s.io/code-generator/cmd/informer-gen/generators/generic.go
View File

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

2
staging/src/k8s.io/code-generator/cmd/informer-gen/generators/groupinterface.go
View File

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

4
staging/src/k8s.io/code-generator/cmd/informer-gen/generators/informer.go
View File

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

4
staging/src/k8s.io/code-generator/cmd/informer-gen/generators/packages.go
View File

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

2
staging/src/k8s.io/code-generator/cmd/informer-gen/main.go
View File

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

4
staging/src/k8s.io/code-generator/cmd/lister-gen/BUILD
View File

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

4
staging/src/k8s.io/code-generator/cmd/lister-gen/generators/BUILD
View File

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

2
staging/src/k8s.io/code-generator/cmd/lister-gen/generators/expansion.go
View File

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

4
staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go
View File

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

2
staging/src/k8s.io/code-generator/cmd/lister-gen/main.go
View File

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

10
staging/src/k8s.io/code-generator/hack/update-codegen.sh
View File

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

4
staging/src/k8s.io/code-generator/test/apis/testgroup/BUILD
View File

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

2
staging/src/k8s.io/code-generator/test/apis/testgroup/doc.go
View File

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

4
staging/src/k8s.io/code-generator/test/apis/testgroup/install/BUILD
View File

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

4
staging/src/k8s.io/code-generator/test/apis/testgroup/install/install.go
View File

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

8
staging/src/k8s.io/code-generator/test/clientset/internal/BUILD
View File

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

2
staging/src/k8s.io/code-generator/test/clientset/internal/clientset.go
View File

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

8
staging/src/k8s.io/code-generator/test/clientset/internal/fake/BUILD
View File

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

6
staging/src/k8s.io/code-generator/test/clientset/internal/fake/clientset_generated.go
View File

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

2
staging/src/k8s.io/code-generator/test/clientset/internal/fake/register.go
View File

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

2
staging/src/k8s.io/code-generator/test/clientset/internal/scheme/BUILD
View File

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

2
staging/src/k8s.io/code-generator/test/clientset/internal/scheme/register.go
View File

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

6
staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/BUILD
View File

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

4
staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake/BUILD
View File

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

2
staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testgroup_client.go
View File

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

2
staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testtype.go
View File

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

2
staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/testgroup_client.go
View File

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

4
staging/src/k8s.io/code-generator/test/clientset/internal/typed/testgroup/internalversion/testtype.go
View File

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

8
staging/src/k8s.io/code-generator/test/clientset/versioned/BUILD
View File

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

2
staging/src/k8s.io/code-generator/test/clientset/versioned/clientset.go
View File

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

8
staging/src/k8s.io/code-generator/test/clientset/versioned/fake/BUILD
View File

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

6
staging/src/k8s.io/code-generator/test/clientset/versioned/fake/clientset_generated.go
View File

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

2
staging/src/k8s.io/code-generator/test/clientset/versioned/fake/register.go
View File

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

2
staging/src/k8s.io/code-generator/test/clientset/versioned/scheme/BUILD
View File

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

2
staging/src/k8s.io/code-generator/test/clientset/versioned/scheme/register.go
View File

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

6
staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/BUILD
View File

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

4
staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake/BUILD
View File

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

2
staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake/fake_testgroup_client.go
View File

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

2
staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/fake/fake_testtype.go
View File

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

4
staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/testgroup_client.go
View File

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

4
staging/src/k8s.io/code-generator/test/clientset/versioned/typed/testgroup/v1/testtype.go
View File

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

12
staging/src/k8s.io/code-generator/test/informers/externalversions/BUILD
View File

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

6
staging/src/k8s.io/code-generator/test/informers/externalversions/factory.go
View File

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

2
staging/src/k8s.io/code-generator/test/informers/externalversions/generic.go
View File

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

2
staging/src/k8s.io/code-generator/test/informers/externalversions/internalinterfaces/BUILD
View File

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

2
staging/src/k8s.io/code-generator/test/informers/externalversions/internalinterfaces/factory_interfaces.go
View File

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

6
staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/BUILD
View File

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

4
staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/interface.go
View File

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

8
staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/v1/BUILD
View File

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

2
staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/v1/interface.go
View File

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

8
staging/src/k8s.io/code-generator/test/informers/externalversions/testgroup/v1/testtype.go
View File

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

12
staging/src/k8s.io/code-generator/test/informers/internalversion/BUILD
View File

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

6
staging/src/k8s.io/code-generator/test/informers/internalversion/factory.go
View File

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

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