github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #49114 from sttts/sttts-kube-gen

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 49114, 48810)

Move generators to staging/src/k8s.io/kube-gen

Reason number one for people trying the impossible of vendoring kube: reuse of the generators.
This commit is contained in:
Kubernetes Submit Queue
2017-07-20 07:20:37 -07:00
committed by GitHub
parent c35bf2aa7b 660ada4381
commit c3a9270ed4
151 changed files with 557 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/root/Makefile
View File

@@ -425,7 +425,6 @@ define CMD_HELP_INFO
# make kubectl kube-proxy
endef
#TODO: make EXCLUDE_TARGET auto-generated when there are other files in cmd/
#TODO: should we exclude the target "libs" but include "cmd/libs/go2idl/*"?
EXCLUDE_TARGET=OWNERS
.PHONY: $(filter-out %$(EXCLUDE_TARGET),$(notdir $(abspath $(wildcard cmd/*/))))
ifeq ($(PRINT_HELP),y)

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 cmd/libs/go2idl/deepcopy-gen/main.go
# touch vendor/k8s.io/kube-gen/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 cmd/libs/go2idl/conversion-gen/main.go
# touch vendor/k8s.io/kube-gen/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}}' \
./cmd/libs/go2idl/deepcopy-gen \
./vendor/k8s.io/kube-gen/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 cmd/libs/go2idl/deepcopy-gen
hack/make-rules/build.sh ./vendor/k8s.io/kube-gen/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}}' \
./cmd/libs/go2idl/defaulter-gen \
./vendor/k8s.io/kube-gen/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 cmd/libs/go2idl/defaulter-gen
hack/make-rules/build.sh ./vendor/k8s.io/kube-gen/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}}' \
./cmd/libs/go2idl/openapi-gen \
./vendor/k8s.io/kube-gen/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 cmd/libs/go2idl/openapi-gen
hack/make-rules/build.sh ./vendor/k8s.io/kube-gen/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}}' \
./cmd/libs/go2idl/conversion-gen \
./vendor/k8s.io/kube-gen/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 cmd/libs/go2idl/conversion-gen
hack/make-rules/build.sh ./vendor/k8s.io/kube-gen/cmd/conversion-gen
touch $@

10
cmd/BUILD
View File

@@ -31,16 +31,6 @@ filegroup(
"//cmd/kubectl:all-srcs",
"//cmd/kubelet:all-srcs",
"//cmd/kubemark:all-srcs",
"//cmd/libs/go2idl/client-gen:all-srcs",
"//cmd/libs/go2idl/conversion-gen:all-srcs",
"//cmd/libs/go2idl/deepcopy-gen:all-srcs",
"//cmd/libs/go2idl/defaulter-gen:all-srcs",
"//cmd/libs/go2idl/go-to-protobuf:all-srcs",
"//cmd/libs/go2idl/import-boss:all-srcs",
"//cmd/libs/go2idl/informer-gen:all-srcs",
"//cmd/libs/go2idl/lister-gen:all-srcs",
"//cmd/libs/go2idl/openapi-gen:all-srcs",
"//cmd/libs/go2idl/set-gen:all-srcs",
"//cmd/linkcheck:all-srcs",
"//cmd/mungedocs:all-srcs",
],

14
cmd/libs/go2idl/.import-restrictions
View File

@@ -1,14 +0,0 @@
{
"Rules": [
{
"SelectorRegexp": "k8s[.]io",
"AllowedPrefixes": [
"k8s.io/kubernetes/cmd/libs/go2idl",
"k8s.io/gengo",
"k8s.io/kubernetes/third_party",
"k8s.io/apimachinery/third_party",
"k8s.io/apimachinery/pkg/util/sets"
]
}
]
}

50
cmd/libs/go2idl/client-gen/BUILD
View File

@@ -1,50 +0,0 @@
package(default_visibility = ["//visibility:public"])
licenses(["notice"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_binary",
"go_library",
)
go_binary(
name = "client-gen",
library = ":go_default_library",
tags = ["automanaged"],
)
go_library(
name = "go_default_library",
srcs = ["main.go"],
tags = ["automanaged"],
deps = [
"//cmd/libs/go2idl/client-gen/args:go_default_library",
"//cmd/libs/go2idl/client-gen/generators:go_default_library",
"//cmd/libs/go2idl/client-gen/types:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
"//vendor/k8s.io/gengo/args:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//cmd/libs/go2idl/client-gen/args:all-srcs",
"//cmd/libs/go2idl/client-gen/generators:all-srcs",
"//cmd/libs/go2idl/client-gen/path:all-srcs",
"//cmd/libs/go2idl/client-gen/test_apis/testgroup:all-srcs",
"//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset:all-srcs",
"//cmd/libs/go2idl/client-gen/types:all-srcs",
],
tags = ["automanaged"],
)

28
cmd/libs/go2idl/client-gen/args/BUILD
View File

@@ -1,28 +0,0 @@
package(default_visibility = ["//visibility:public"])
licenses(["notice"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
)
go_library(
name = "go_default_library",
srcs = ["args.go"],
tags = ["automanaged"],
deps = ["//cmd/libs/go2idl/client-gen/types:go_default_library"],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)

42
cmd/libs/go2idl/go-to-protobuf/BUILD
View File

@@ -1,42 +0,0 @@
package(default_visibility = ["//visibility:public"])
licenses(["notice"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_binary",
"go_library",
)
go_binary(
name = "go-to-protobuf",
library = ":go_default_library",
tags = ["automanaged"],
)
go_library(
name = "go_default_library",
srcs = ["main.go"],
tags = ["automanaged"],
deps = [
"//cmd/libs/go2idl/go-to-protobuf/protobuf:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//cmd/libs/go2idl/go-to-protobuf/protobuf:all-srcs",
"//cmd/libs/go2idl/go-to-protobuf/protoc-gen-gogo:all-srcs",
],
tags = ["automanaged"],
)

15
cmd/libs/go2idl/openapi-gen/.import-restrictions
View File

@@ -1,15 +0,0 @@
{
"Rules": [
{
"SelectorRegexp": "k8s[.]io",
"AllowedPrefixes": [
"k8s.io/kubernetes/cmd/libs/go2idl",
"k8s.io/apimachinery/pkg/openapi",
"k8s.io/gengo",
"k8s.io/kubernetes/third_party",
"k8s.io/apimachinery/third_party",
"k8s.io/apimachinery/pkg/util/sets"
]
}
]
}

22
hack/.golint_failures
View File

@@ -33,17 +33,6 @@ cmd/kubectl/app
cmd/kubelet/app
cmd/kubelet/app/options
cmd/kubemark
cmd/libs/go2idl/client-gen/args
cmd/libs/go2idl/client-gen/generators/fake
cmd/libs/go2idl/client-gen/generators/scheme
cmd/libs/go2idl/client-gen/test_apis/testgroup
cmd/libs/go2idl/client-gen/test_apis/testgroup/v1
cmd/libs/go2idl/client-gen/types
cmd/libs/go2idl/conversion-gen/generators
cmd/libs/go2idl/go-to-protobuf/protobuf
cmd/libs/go2idl/informer-gen/generators
cmd/libs/go2idl/lister-gen/generators
cmd/libs/go2idl/openapi-gen/generators
cmd/mungedocs
examples/guestbook-go
federation/apis/core
@@ -785,6 +774,17 @@ 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/test_apis/testgroup
staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1
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/cmd/openapi-gen/generators
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/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 \
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 \
\( \
-not \( \
\( \

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

@@ -274,11 +274,11 @@ runTests() {
# separate files.
# ignore paths:
# cmd/libs/go2idl/generator: is fragile when run under coverage, so ignore it for now.
# vendor/k8s.io/kube-gen/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="cmd/libs/go2idl/generator|vendor/k8s.io/client-go/1.4/rest"
cover_ignore_dirs="vendor/k8s.io/kube-gen/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

16
hack/update-codegen.sh
View File

@@ -24,9 +24,9 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env
BUILD_TARGETS=(
cmd/libs/go2idl/client-gen
cmd/libs/go2idl/lister-gen
cmd/libs/go2idl/informer-gen
vendor/k8s.io/kube-gen/cmd/client-gen
vendor/k8s.io/kube-gen/cmd/lister-gen
vendor/k8s.io/kube-gen/cmd/informer-gen
)
make -C "${KUBE_ROOT}" WHAT="${BUILD_TARGETS[*]}"
@@ -60,7 +60,7 @@ GV_DIRS_CSV=$(IFS=',';echo "${GV_DIRS[*]// /,}";IFS=$)
# This can be called with one flag, --verify-only, so it works for both the
# update- and verify- scripts.
${clientgen} "$@"
${clientgen} -t "$@"
${clientgen} -t "$@" --output-base "${KUBE_ROOT}/vendor"
${clientgen} --clientset-name="clientset" --input-base="k8s.io/kubernetes/vendor/k8s.io/api" --input="${GV_DIRS_CSV}" "$@"
# Clientgen for federation clientset.
${clientgen} --clientset-name=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/","api/","extensions/","batch/","autoscaling/" --included-types-overrides="api/Service,api/Namespace,extensions/ReplicaSet,api/Secret,extensions/Ingress,extensions/Deployment,extensions/DaemonSet,api/ConfigMap,api/Event,batch/Job,autoscaling/HorizontalPodAutoscaler" "$@"
@@ -121,7 +121,7 @@ ${informergen} \
# You may add additional calls of code generators like set-gen above.
# call generation on sub-project for now
vendor/k8s.io/kube-aggregator/hack/update-codegen.sh
vendor/k8s.io/sample-apiserver/hack/update-codegen.sh
vendor/k8s.io/apiextensions-apiserver/hack/update-codegen.sh
vendor/k8s.io/metrics/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

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=(
cmd/libs/go2idl/go-to-protobuf
cmd/libs/go2idl/go-to-protobuf/protoc-gen-gogo
vendor/k8s.io/kube-gen/cmd/go-to-protobuf
vendor/k8s.io/kube-gen/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=(
cmd/libs/go2idl/go-to-protobuf/protoc-gen-gogo
vendor/k8s.io/kube-gen/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}/cmd/libs/go2idl/client-gen/main.go"
client_gen_file="${KUBE_ROOT}/vendor/k8s.io/kube-gen/cmd/client-gen/main.go"
for group_dirname in "${group_dirnames[@]}"; do
if ! grep -q "${group_dirname}/" "${client_gen_file}" ; then

11
hack/verify-codegen.sh
View File

@@ -24,9 +24,12 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env
# call verify on sub-project for now
vendor/k8s.io/kube-aggregator/hack/verify-codegen.sh
vendor/k8s.io/sample-apiserver/hack/verify-codegen.sh
vendor/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh
vendor/k8s.io/metrics/hack/verify-codegen.sh
#
# 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-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
"${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=cmd/libs/go2idl/import-boss
make -C "${KUBE_ROOT}" WHAT=vendor/k8s.io/kube-gen/cmd/import-boss
$(kube::util::find-binary "import-boss") --verify-only

1
hack/verify-staging-imports.sh
View File

@@ -67,6 +67,7 @@ function print_forbidden_imports () {
RC=0
print_forbidden_imports apimachinery should_be_leaf || RC=1
print_forbidden_imports api k8s.io/apimachinery || RC=1
print_forbidden_imports kube-gen k8s.io/apimachinery k8s.io/client-go k8s.io/gengo || RC=1
print_forbidden_imports client-go k8s.io/apimachinery k8s.io/api || RC=1
print_forbidden_imports apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/api || RC=1
print_forbidden_imports metrics k8s.io/apimachinery k8s.io/client-go k8s.io/api || RC=1

2
pkg/generated/openapi/BUILD
View File

@@ -8,7 +8,6 @@ openapi_library(
name = "go_default_library",
srcs = ["doc.go"],
openapi_targets = [
"cmd/libs/go2idl/client-gen/test_apis/testgroup/v1",
"federation/apis/federation/v1beta1",
"pkg/apis/abac/v0",
"pkg/apis/abac/v1beta1",
@@ -51,6 +50,7 @@ openapi_library(
"k8s.io/apiserver/pkg/apis/example/v1",
"k8s.io/client-go/pkg/version",
"k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1",
"k8s.io/kube-gen/cmd/client-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 //cmd/libs/go2idl/openapi-gen)",
"$(location //vendor/k8s.io/kube-gen/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 $(GENDIR)/pkg/generated/openapi",
]),
go_deps = deps,
tools = ["//cmd/libs/go2idl/openapi-gen"],
tools = ["//vendor/k8s.io/kube-gen/cmd/openapi-gen"],
)

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 cmd/libs/go2idl/set-gen/main.go
git checkout vendor/k8s.io/kube-gen/cmd/set-gen/main.go
# now run gofmt to get the sorting right

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

@@ -18,9 +18,9 @@ set -o errexit
set -o nounset
set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../..
APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/init.sh"
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)}
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}" ./cmd/libs/go2idl/client-gen
go build -o "${CLIENTGEN}" ${KUBEGEN_PKG}/cmd/client-gen
PREFIX=k8s.io/apiextensions-apiserver/pkg/apis
INPUT_BASE="--input-base ${PREFIX}"
@@ -52,25 +52,25 @@ apiextensions/v1beta1
INPUT="--input ${INPUT_APIS[@]}"
CLIENTSET_PATH="--clientset-path k8s.io/apiextensions-apiserver/pkg/client/clientset"
${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor
${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiextensions/v1beta1 ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor
${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${SCRIPT_BASE}
${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiextensions/v1beta1 ${CLIENTSET_PATH} --output-base ${SCRIPT_BASE}
echo "Building lister-gen"
listergen="${PWD}/lister-gen"
go build -o "${listergen}" ./cmd/libs/go2idl/lister-gen
go build -o "${listergen}" ${KUBEGEN_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"
${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${KUBE_ROOT}/vendor
${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${SCRIPT_BASE}
echo "Building informer-gen"
informergen="${PWD}/informer-gen"
go build -o "${informergen}" ./cmd/libs/go2idl/informer-gen
go build -o "${informergen}" ${KUBEGEN_PKG}/cmd/informer-gen
${informergen} \
--output-base ${KUBE_ROOT}/vendor \
--output-base ${SCRIPT_BASE} \
--input-dirs k8s.io/apiextensions-apiserver/pkg/apis/apiextensions --input-dirs k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1 \
--versioned-clientset-package k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset \
--internal-clientset-package k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset \

13
staging/src/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh
View File

@@ -18,13 +18,12 @@ set -o errexit
set -o nounset
set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../..
APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/init.sh"
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
SCRIPT_BASE=${SCRIPT_ROOT}/../..
DIFFROOT="${APIFEDERATOR_ROOT}/pkg"
TMP_DIFFROOT="${APIFEDERATOR_ROOT}/_tmp/pkg"
_tmp="${APIFEDERATOR_ROOT}/_tmp"
DIFFROOT="${SCRIPT_ROOT}/pkg"
TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg"
_tmp="${SCRIPT_ROOT}/_tmp"
cleanup() {
rm -rf "${_tmp}"
@@ -36,7 +35,7 @@ cleanup
mkdir -p "${TMP_DIFFROOT}"
cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
"${APIFEDERATOR_ROOT}/hack/update-codegen.sh"
"${SCRIPT_ROOT}/hack/update-codegen.sh"
echo "diffing ${DIFFROOT} against freshly generated codegen"
ret=0
diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?

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

@@ -36,7 +36,7 @@ go_genrule(
"string.go",
],
cmd = """
$(location //cmd/libs/go2idl/set-gen) \
$(location //vendor/k8s.io/kube-gen/cmd/set-gen) \
--input-dirs ./vendor/k8s.io/apimachinery/pkg/util/sets/types \
--output-base $(GENDIR)/vendor/k8s.io/apimachinery/pkg/util \
--go-header-file $(location //hack/boilerplate:boilerplate.go.txt) \
@@ -46,7 +46,7 @@ $(location //cmd/libs/go2idl/set-gen) \
"//vendor/k8s.io/apimachinery/pkg/util/sets/types:go_default_library",
],
tools = [
"//cmd/libs/go2idl/set-gen",
"//vendor/k8s.io/kube-gen/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/kubernetes/cmd/libs/go2idl/set-gen`)
// (You must first `go install k8s.io/kube-gen/cmd/set-gen`)
package types
//go:generate set-gen -i k8s.io/kubernetes/pkg/util/sets/types

2
staging/src/k8s.io/apiserver/pkg/server/openapi/openapi.go
View File

@@ -155,7 +155,7 @@ func (o *openAPI) buildDefinitionRecursively(name string) error {
// buildDefinitionForType build a definition for a given type and return a referable name to it's definition.
// This is the main function that keep track of definitions used in this spec and is depend on code generated
// by k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen.
// by k8s.io/kube-gen/cmd/openapi-gen.
func (o *openAPI) buildDefinitionForType(sample interface{}) (string, error) {
t := reflect.TypeOf(sample)
if t.Kind() == reflect.Ptr {

21
staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
View File

@@ -18,9 +18,9 @@ set -o errexit
set -o nounset
set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../..
APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/init.sh"
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)}
if LANG=C sed --help 2>&1 | grep -q GNU; then
SED="sed"
@@ -41,7 +41,8 @@ trap cleanup EXIT
echo "Building client-gen"
CLIENTGEN="${PWD}/client-gen-binary"
go build -o "${CLIENTGEN}" ./cmd/libs/go2idl/client-gen
go build -o "${CLIENTGEN}" ${KUBEGEN_PKG}/cmd/client-gen
PREFIX=k8s.io/kube-aggregator/pkg/apis
INPUT_BASE="--input-base ${PREFIX}"
@@ -52,25 +53,25 @@ apiregistration/v1beta1
INPUT="--input ${INPUT_APIS[@]}"
CLIENTSET_PATH="--clientset-path k8s.io/kube-aggregator/pkg/client/clientset_generated"
${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor
${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiregistration/v1beta1 ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor
${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${SCRIPT_BASE}
${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiregistration/v1beta1 ${CLIENTSET_PATH} --output-base ${SCRIPT_BASE}
echo "Building lister-gen"
listergen="${PWD}/lister-gen"
go build -o "${listergen}" ./cmd/libs/go2idl/lister-gen
go build -o "${listergen}" ${KUBEGEN_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"
${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${KUBE_ROOT}/vendor
${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${SCRIPT_BASE}
echo "Building informer-gen"
informergen="${PWD}/informer-gen"
go build -o "${informergen}" ./cmd/libs/go2idl/informer-gen
go build -o "${informergen}" ${KUBEGEN_PKG}/cmd/informer-gen
${informergen} \
--output-base ${KUBE_ROOT}/vendor \
--output-base ${SCRIPT_BASE} \
--input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1 \
--versioned-clientset-package k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset \
--internal-clientset-package k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset \

13
staging/src/k8s.io/kube-aggregator/hack/verify-codegen.sh
View File

@@ -18,13 +18,12 @@ set -o errexit
set -o nounset
set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../..
APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/init.sh"
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
SCRIPT_BASE=${SCRIPT_ROOT}/../..
DIFFROOT="${APIFEDERATOR_ROOT}/pkg"
TMP_DIFFROOT="${APIFEDERATOR_ROOT}/_tmp/pkg"
_tmp="${APIFEDERATOR_ROOT}/_tmp"
DIFFROOT="${SCRIPT_ROOT}/pkg"
TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg"
_tmp="${SCRIPT_ROOT}/_tmp"
cleanup() {
rm -rf "${_tmp}"
@@ -36,7 +35,7 @@ cleanup
mkdir -p "${TMP_DIFFROOT}"
cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
"${APIFEDERATOR_ROOT}/hack/update-codegen.sh"
"${SCRIPT_ROOT}/hack/update-codegen.sh"
echo "diffing ${DIFFROOT} against freshly generated codegen"
ret=0
diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?

290
staging/src/k8s.io/kube-gen/Godeps Normal file
View File

@@ -0,0 +1,290 @@
{
"ImportPath": "k8s.io/kube-gen",
"GoVersion": "go1.8",
"GodepVersion": "v79",
"Packages": [
"./..."
],
"Deps": [
{
"ImportPath": "github.com/PuerkitoBio/purell",
"Rev": "8a290539e2e8629dbc4e6bad948158f790ec31f4"
},
{
"ImportPath": "github.com/PuerkitoBio/urlesc",
"Rev": "5bd2802263f21d8788851d5305584c82a5c75d7e"
},
{
"ImportPath": "github.com/davecgh/go-spew/spew",
"Rev": "782f4967f2dc4564575ca782fe2d04090b5faca8"
},
{
"ImportPath": "github.com/emicklei/go-restful",
"Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46"
},
{
"ImportPath": "github.com/emicklei/go-restful-swagger12",
"Rev": "dcef7f55730566d41eae5db10e7d6981829720f6"
},
{
"ImportPath": "github.com/emicklei/go-restful/log",
"Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46"
},
{
"ImportPath": "github.com/ghodss/yaml",
"Rev": "73d445a93680fa1a78ae23a5839bad48f32ba1ee"
},
{
"ImportPath": "github.com/go-openapi/jsonpointer",
"Rev": "46af16f9f7b149af66e5d1bd010e3574dc06de98"
},
{
"ImportPath": "github.com/go-openapi/jsonreference",
"Rev": "13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
},
{
"ImportPath": "github.com/go-openapi/spec",
"Rev": "6aced65f8501fe1217321abf0749d354824ba2ff"
},
{
"ImportPath": "github.com/go-openapi/swag",
"Rev": "1d0bd113de87027671077d3c71eb3ac5d7dbba72"
},
{
"ImportPath": "github.com/gogo/protobuf/gogoproto",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/plugin/compare",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/plugin/defaultcheck",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/plugin/description",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/plugin/embedcheck",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/plugin/enumstringer",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/plugin/equal",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/plugin/face",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/plugin/gostring",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/plugin/marshalto",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/plugin/oneofcheck",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/plugin/populate",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/plugin/size",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/plugin/stringer",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/plugin/testgen",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/plugin/union",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/plugin/unmarshal",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/proto",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/protoc-gen-gogo/descriptor",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/protoc-gen-gogo/generator",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/protoc-gen-gogo/grpc",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/protoc-gen-gogo/plugin",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/sortkeys",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/vanity",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/gogo/protobuf/vanity/command",
"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
},
{
"ImportPath": "github.com/golang/glog",
"Rev": "44145f04b68cf362d9c4df2182967c2275eaefed"
},
{
"ImportPath": "github.com/golang/protobuf/proto",
"Rev": "4bd1920723d7b7c925de087aa32e2187708897f7"
},
{
"ImportPath": "github.com/golang/protobuf/ptypes",
"Rev": "4bd1920723d7b7c925de087aa32e2187708897f7"
},
{
"ImportPath": "github.com/golang/protobuf/ptypes/any",
"Rev": "4bd1920723d7b7c925de087aa32e2187708897f7"
},
{
"ImportPath": "github.com/golang/protobuf/ptypes/duration",
"Rev": "4bd1920723d7b7c925de087aa32e2187708897f7"
},
{
"ImportPath": "github.com/golang/protobuf/ptypes/timestamp",
"Rev": "4bd1920723d7b7c925de087aa32e2187708897f7"
},
{
"ImportPath": "github.com/google/gofuzz",
"Rev": "44d81051d367757e1c7c6a5a86423ece9afcf63c"
},
{
"ImportPath": "github.com/googleapis/gnostic/OpenAPIv2",
"Rev": "68f4ded48ba9414dab2ae69b3f0d69971da73aa5"
},
{
"ImportPath": "github.com/googleapis/gnostic/compiler",
"Rev": "68f4ded48ba9414dab2ae69b3f0d69971da73aa5"
},
{
"ImportPath": "github.com/googleapis/gnostic/extensions",
"Rev": "68f4ded48ba9414dab2ae69b3f0d69971da73aa5"
},
{
"ImportPath": "github.com/juju/ratelimit",
"Rev": "5b9ff866471762aa2ab2dced63c9fb6f53921342"
},
{
"ImportPath": "github.com/mailru/easyjson/buffer",
"Rev": "d5b7844b561a7bc640052f1b935f7b800330d7e0"
},
{
"ImportPath": "github.com/mailru/easyjson/jlexer",
"Rev": "d5b7844b561a7bc640052f1b935f7b800330d7e0"
},
{
"ImportPath": "github.com/mailru/easyjson/jwriter",
"Rev": "d5b7844b561a7bc640052f1b935f7b800330d7e0"
},
{
"ImportPath": "github.com/pmezard/go-difflib/difflib",
"Rev": "d8ed2627bdf02c080bf22230dbb337003b7aba2d"
},
{
"ImportPath": "github.com/spf13/pflag",
"Rev": "9ff6c6923cfffbcd502984b8e0c80539a94968b7"
},
{
"ImportPath": "github.com/stretchr/testify/assert",
"Rev": "f6abca593680b2315d2075e0f5e2a9751e3f431a"
},
{
"ImportPath": "github.com/ugorji/go/codec",
"Rev": "ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"
},
{
"ImportPath": "golang.org/x/net/http2",
"Rev": "f2499483f923065a842d38eb4c7f1927e6fc6e6d"
},
{
"ImportPath": "golang.org/x/net/http2/hpack",
"Rev": "f2499483f923065a842d38eb4c7f1927e6fc6e6d"
},
{
"ImportPath": "golang.org/x/net/idna",
"Rev": "f2499483f923065a842d38eb4c7f1927e6fc6e6d"
},
{
"ImportPath": "golang.org/x/net/lex/httplex",
"Rev": "f2499483f923065a842d38eb4c7f1927e6fc6e6d"
},
{
"ImportPath": "golang.org/x/text/cases",
"Rev": "2910a502d2bf9e43193af9d68ca516529614eed3"
},
{
"ImportPath": "golang.org/x/text/internal/tag",
"Rev": "2910a502d2bf9e43193af9d68ca516529614eed3"
},
{
"ImportPath": "golang.org/x/text/language",
"Rev": "2910a502d2bf9e43193af9d68ca516529614eed3"
},
{
"ImportPath": "golang.org/x/text/runes",
"Rev": "2910a502d2bf9e43193af9d68ca516529614eed3"
},
{
"ImportPath": "golang.org/x/text/secure/bidirule",
"Rev": "2910a502d2bf9e43193af9d68ca516529614eed3"
},
{
"ImportPath": "golang.org/x/text/secure/precis",
"Rev": "2910a502d2bf9e43193af9d68ca516529614eed3"
},
{
"ImportPath": "golang.org/x/text/transform",
"Rev": "2910a502d2bf9e43193af9d68ca516529614eed3"
},
{
"ImportPath": "golang.org/x/text/unicode/bidi",
"Rev": "2910a502d2bf9e43193af9d68ca516529614eed3"
},
{
"ImportPath": "golang.org/x/text/unicode/norm",
"Rev": "2910a502d2bf9e43193af9d68ca516529614eed3"
},
{
"ImportPath": "golang.org/x/text/width",
"Rev": "2910a502d2bf9e43193af9d68ca516529614eed3"
},
{
"ImportPath": "gopkg.in/inf.v0",
"Rev": "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"
},
{
"ImportPath": "gopkg.in/yaml.v2",
"Rev": "53feefa2559fb8dfa8d81baad31be332c97d6c77"
}
]
}

0
cmd/libs/go2idl/OWNERS → staging/src/k8s.io/kube-gen/OWNERS
View File

0
cmd/libs/go2idl/client-gen/.import-restrictions → staging/src/k8s.io/kube-gen/cmd/client-gen/.import-restrictions
View File

29
staging/src/k8s.io/kube-gen/cmd/client-gen/BUILD Normal file
View File

@@ -0,0 +1,29 @@
package(default_visibility = ["//visibility:public"])
licenses(["notice"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_binary",
"go_library",
)
go_binary(
name = "client-gen",
library = ":go_default_library",
tags = ["automanaged"],
)
go_library(
name = "go_default_library",
srcs = ["main.go"],
tags = ["automanaged"],
deps = [
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/spf13/pflag: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",
],
)

0
cmd/libs/go2idl/client-gen/OWNERS → staging/src/k8s.io/kube-gen/cmd/client-gen/OWNERS
View File

2
cmd/libs/go2idl/client-gen/README.md → staging/src/k8s.io/kube-gen/cmd/client-gen/README.md
View File

@@ -1,4 +1,4 @@
See [generating-clientset.md](https://kubernetes.io/docs/devel/generating-clientset.md)
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cmd/libs/go2idl/client-gen/README.md?pixel)]()
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/staging/src/k8s.io/kube-gen/client-gen/README.md?pixel)]()

15
staging/src/k8s.io/kube-gen/cmd/client-gen/args/BUILD Normal file
View File

@@ -0,0 +1,15 @@
package(default_visibility = ["//visibility:public"])
licenses(["notice"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
)
go_library(
name = "go_default_library",
srcs = ["args.go"],
tags = ["automanaged"],
deps = ["//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library"],
)

2
cmd/libs/go2idl/client-gen/args/args.go → staging/src/k8s.io/kube-gen/cmd/client-gen/args/args.go
View File

@@ -16,7 +16,7 @@ limitations under the License.
package args
import "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
import "k8s.io/kube-gen/cmd/client-gen/types"
// ClientGenArgs is a wrapper for arguments to client-gen.
type Args struct {

27
cmd/libs/go2idl/client-gen/generators/BUILD → staging/src/k8s.io/kube-gen/cmd/client-gen/generators/BUILD
View File

@@ -19,32 +19,15 @@ go_library(
],
tags = ["automanaged"],
deps = [
"//cmd/libs/go2idl/client-gen/args:go_default_library",
"//cmd/libs/go2idl/client-gen/generators/fake:go_default_library",
"//cmd/libs/go2idl/client-gen/generators/scheme:go_default_library",
"//cmd/libs/go2idl/client-gen/path:go_default_library",
"//cmd/libs/go2idl/client-gen/types:go_default_library",
"//vendor/github.com/golang/glog: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/path:go_default_library",
"//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//cmd/libs/go2idl/client-gen/generators/fake:all-srcs",
"//cmd/libs/go2idl/client-gen/generators/scheme:all-srcs",
],
tags = ["automanaged"],
)

10
cmd/libs/go2idl/client-gen/generators/client_generator.go → staging/src/k8s.io/kube-gen/cmd/client-gen/generators/client_generator.go
View File

@@ -26,11 +26,11 @@ import (
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/fake"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/scheme"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/path"
clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/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/path"
clientgentypes "k8s.io/kube-gen/cmd/client-gen/types"
"github.com/golang/glog"
)

21
cmd/libs/go2idl/client-gen/generators/fake/BUILD → staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/BUILD
View File

@@ -17,26 +17,13 @@ go_library(
],
tags = ["automanaged"],
deps = [
"//cmd/libs/go2idl/client-gen/args:go_default_library",
"//cmd/libs/go2idl/client-gen/generators/scheme:go_default_library",
"//cmd/libs/go2idl/client-gen/path:go_default_library",
"//cmd/libs/go2idl/client-gen/types:go_default_library",
"//vendor/github.com/golang/glog: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/path:go_default_library",
"//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)

6
cmd/libs/go2idl/client-gen/generators/fake/fake_client_generator.go → staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/fake_client_generator.go
View File

@@ -24,9 +24,9 @@ import (
"k8s.io/gengo/generator"
"k8s.io/gengo/types"
clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args"
scheme "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/scheme"
clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
clientgenargs "k8s.io/kube-gen/cmd/client-gen/args"
scheme "k8s.io/kube-gen/cmd/client-gen/generators/scheme"
clientgentypes "k8s.io/kube-gen/cmd/client-gen/types"
)
func PackageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clientsetPackage string, inputPackage string, boilerplate []byte, generatedBy string) generator.Package {

2
cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go → staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/generator_fake_for_clientset.go
View File

@@ -25,7 +25,7 @@ import (
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
clientgentypes "k8s.io/kube-gen/cmd/client-gen/types"
)
// genClientset generates a package for a clientset.

0
cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_group.go → staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/generator_fake_for_group.go
View File

2
cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go → staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/generator_fake_for_type.go
View File

@@ -24,7 +24,7 @@ import (
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/path"
"k8s.io/kube-gen/cmd/client-gen/path"
)
// genFakeForType produces a file for each top-level type.

2
cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go → staging/src/k8s.io/kube-gen/cmd/client-gen/generators/generator_for_clientset.go
View File

@@ -25,7 +25,7 @@ import (
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
clientgentypes "k8s.io/kube-gen/cmd/client-gen/types"
)
// genClientset generates a package for a clientset.

0
cmd/libs/go2idl/client-gen/generators/generator_for_expansion.go → staging/src/k8s.io/kube-gen/cmd/client-gen/generators/generator_for_expansion.go
View File

2
cmd/libs/go2idl/client-gen/generators/generator_for_group.go → staging/src/k8s.io/kube-gen/cmd/client-gen/generators/generator_for_group.go
View File

@@ -23,7 +23,7 @@ import (
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/path"
"k8s.io/kube-gen/cmd/client-gen/path"
)
// genGroup produces a file for a group client, e.g. ExtensionsClient for the extension group.

0
cmd/libs/go2idl/client-gen/generators/generator_for_type.go → staging/src/k8s.io/kube-gen/cmd/client-gen/generators/generator_for_type.go
View File

17
cmd/libs/go2idl/client-gen/generators/scheme/BUILD → staging/src/k8s.io/kube-gen/cmd/client-gen/generators/scheme/BUILD
View File

@@ -12,23 +12,10 @@ go_library(
srcs = ["generator_for_scheme.go"],
tags = ["automanaged"],
deps = [
"//cmd/libs/go2idl/client-gen/path:go_default_library",
"//cmd/libs/go2idl/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",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)

4
cmd/libs/go2idl/client-gen/generators/scheme/generator_for_scheme.go → staging/src/k8s.io/kube-gen/cmd/client-gen/generators/scheme/generator_for_scheme.go
View File

@@ -26,8 +26,8 @@ import (
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/path"
clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/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.

0
cmd/libs/go2idl/client-gen/generators/tags.go → staging/src/k8s.io/kube-gen/cmd/client-gen/generators/tags.go
View File

12
cmd/libs/go2idl/client-gen/main.go → staging/src/k8s.io/kube-gen/cmd/client-gen/main.go
View File

@@ -24,9 +24,9 @@ import (
"strings"
"k8s.io/gengo/args"
clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
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"
@@ -172,15 +172,15 @@ func main() {
if *test {
arguments.InputDirs = append(dependencies, []string{
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup",
"k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup",
}...)
arguments.CustomArgs = clientgenargs.Args{
Groups: []types.GroupVersions{{Group: "testgroup", Versions: []types.Version{""}}},
GroupVersionToInputPath: map[types.GroupVersion]string{
{Group: "testgroup", Version: ""}: "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup",
{Group: "testgroup", Version: ""}: "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup",
},
ClientsetName: "test_internalclientset",
ClientsetOutputPath: "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/",
ClientsetOutputPath: "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/",
ClientsetOnly: false,
FakeClient: true,
CmdArgs: cmdArgs,

13
cmd/libs/go2idl/client-gen/path/BUILD → staging/src/k8s.io/kube-gen/cmd/client-gen/path/BUILD
View File

@@ -12,16 +12,3 @@ go_library(
srcs = ["path.go"],
tags = ["automanaged"],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)

0
cmd/libs/go2idl/client-gen/path/path.go → staging/src/k8s.io/kube-gen/cmd/client-gen/path/path.go
View File

0
cmd/libs/go2idl/client-gen/test_apis/README → staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/README
View File

17
cmd/libs/go2idl/client-gen/test_apis/testgroup/BUILD → staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/BUILD
View File

@@ -23,20 +23,3 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//cmd/libs/go2idl/client-gen/test_apis/testgroup/install:all-srcs",
"//cmd/libs/go2idl/client-gen/test_apis/testgroup/v1:all-srcs",
],
tags = ["automanaged"],
)

2
cmd/libs/go2idl/client-gen/test_apis/testgroup/doc.go → staging/src/k8s.io/kube-gen/cmd/client-gen/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/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup"
package testgroup // import "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup"

18
cmd/libs/go2idl/client-gen/test_apis/testgroup/install/BUILD → staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install/BUILD
View File

@@ -12,24 +12,10 @@ go_library(
srcs = ["install.go"],
tags = ["automanaged"],
deps = [
"//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library",
"//cmd/libs/go2idl/client-gen/test_apis/testgroup/v1:go_default_library",
"//pkg/api:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup:go_default_library",
"//vendor/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)

11
cmd/libs/go2idl/client-gen/test_apis/testgroup/install/install.go → staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install/install.go
View File

@@ -22,22 +22,17 @@ import (
"k8s.io/apimachinery/pkg/apimachinery/announced"
"k8s.io/apimachinery/pkg/apimachinery/registered"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup"
"k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1"
)
func init() {
Install(api.GroupFactoryRegistry, api.Registry, api.Scheme)
}
// Install registers the API group and adds types to a scheme
func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) {
if err := announced.NewGroupMetaFactory(
&announced.GroupMetaFactoryArgs{
GroupName: testgroup.SchemeGroupVersion.Group,
VersionPreferenceOrder: []string{v1.SchemeGroupVersion.Version},
ImportPrefix: "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup",
ImportPrefix: "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup",
AddInternalObjectsToScheme: testgroup.AddToScheme,
},
announced.VersionToSchemeFunc{

0
cmd/libs/go2idl/client-gen/test_apis/testgroup/register.go → staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/register.go
View File

0
cmd/libs/go2idl/client-gen/test_apis/testgroup/types.go → staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/types.go
View File

13
cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/BUILD → staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/BUILD
View File

@@ -26,16 +26,3 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)

0
cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/doc.go → staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/doc.go
View File

0
cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go → staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/register.go
View File

0
cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go → staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/types.generated.go
View File

0
cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.go → staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/types.go
View File

0
cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/zz_generated.deepcopy.go → staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/zz_generated.deepcopy.go
View File

0
cmd/libs/go2idl/client-gen/test_apis/testgroup/zz_generated.deepcopy.go → staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/zz_generated.deepcopy.go
View File

20
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD
View File

@@ -16,11 +16,11 @@ go_library(
],
tags = ["automanaged"],
deps = [
"//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/client-go/discovery:go_default_library",
"//vendor/k8s.io/client-go/rest:go_default_library",
"//vendor/k8s.io/client-go/util/flowcontrol:go_default_library",
"//vendor/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library",
],
)
@@ -34,21 +34,3 @@ go_test(
"//vendor/k8s.io/client-go/util/flowcontrol:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake:all-srcs",
"//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme:all-srcs",
"//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:all-srcs",
],
tags = ["automanaged"],
)

2
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/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/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion"
testgroupinternalversion "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion"
)
type Interface interface {

0
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset_test.go → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/clientset_test.go
View File

0
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/doc.go → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/doc.go
View File

21
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD
View File

@@ -16,10 +16,6 @@ go_library(
],
tags = ["automanaged"],
deps = [
"//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library",
"//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset:go_default_library",
"//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library",
"//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
@@ -28,18 +24,9 @@ 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/cmd/client-gen/test_apis/testgroup:go_default_library",
"//vendor/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset:go_default_library",
"//vendor/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library",
"//vendor/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)

6
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/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/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset"
testgroupinternalversion "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion"
faketestgroupinternalversion "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake"
clientset "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset"
testgroupinternalversion "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion"
faketestgroupinternalversion "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake"
)
// NewSimpleClientset returns a clientset that will respond with the provided objects.

0
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/doc.go → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/doc.go
View File

2
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/register.go → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/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/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup"
testgroupinternalversion "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup"
)
var scheme = runtime.NewScheme()

15
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/BUILD → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/BUILD
View File

@@ -15,25 +15,12 @@ go_library(
],
tags = ["automanaged"],
deps = [
"//cmd/libs/go2idl/client-gen/test_apis/testgroup/install:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
"//vendor/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)

0
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/doc.go → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/doc.go
View File

2
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/register.go → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/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/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup/install"
testgroup "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install"
os "os"
)

20
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD
View File

@@ -17,27 +17,11 @@ go_library(
],
tags = ["automanaged"],
deps = [
"//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library",
"//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
"//vendor/k8s.io/client-go/rest:go_default_library",
"//vendor/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup:go_default_library",
"//vendor/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake:all-srcs",
],
tags = ["automanaged"],
)

0
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/doc.go → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/doc.go
View File

17
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD
View File

@@ -16,8 +16,6 @@ go_library(
],
tags = ["automanaged"],
deps = [
"//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library",
"//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
@@ -25,18 +23,7 @@ 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/cmd/client-gen/test_apis/testgroup:go_default_library",
"//vendor/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)

0
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/doc.go → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/doc.go
View File

2
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/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/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion"
internalversion "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion"
)
type FakeTestgroup struct {

2
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testtype.go → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/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/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup"
testgroup "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup"
)
// FakeTestTypes implements TestTypeInterface

0
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/generated_expansion.go → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/generated_expansion.go
View File

2
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go
View File

@@ -18,7 +18,7 @@ package internalversion
import (
rest "k8s.io/client-go/rest"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme"
"k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme"
)
type TestgroupInterface interface {

4
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go → staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/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/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup"
scheme "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme"
testgroup "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup"
scheme "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme"
)
// TestTypesGetter has a method to return a TestTypeInterface.

13
cmd/libs/go2idl/client-gen/types/BUILD → staging/src/k8s.io/kube-gen/cmd/client-gen/types/BUILD
View File

@@ -24,16 +24,3 @@ go_test(
library = ":go_default_library",
tags = ["automanaged"],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)

0
cmd/libs/go2idl/client-gen/types/helpers.go → staging/src/k8s.io/kube-gen/cmd/client-gen/types/helpers.go
View File

0
cmd/libs/go2idl/client-gen/types/helpers_test.go → staging/src/k8s.io/kube-gen/cmd/client-gen/types/helpers_test.go
View File

0
cmd/libs/go2idl/client-gen/types/types.go → staging/src/k8s.io/kube-gen/cmd/client-gen/types/types.go
View File

18
cmd/libs/go2idl/conversion-gen/BUILD → staging/src/k8s.io/kube-gen/cmd/conversion-gen/BUILD
View File

@@ -19,25 +19,9 @@ go_library(
srcs = ["main.go"],
tags = ["automanaged"],
deps = [
"//cmd/libs/go2idl/conversion-gen/generators:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
"//vendor/k8s.io/gengo/args:go_default_library",
"//vendor/k8s.io/kube-gen/cmd/conversion-gen/generators:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//cmd/libs/go2idl/conversion-gen/generators:all-srcs",
],
tags = ["automanaged"],
)

13
cmd/libs/go2idl/conversion-gen/generators/BUILD → staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators/BUILD
View File

@@ -20,16 +20,3 @@ go_library(
"//vendor/k8s.io/gengo/types:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)

0
cmd/libs/go2idl/conversion-gen/generators/conversion.go → staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators/conversion.go
View File

2
cmd/libs/go2idl/conversion-gen/main.go → staging/src/k8s.io/kube-gen/cmd/conversion-gen/main.go
View File

@@ -38,7 +38,7 @@ import (
"path/filepath"
"k8s.io/gengo/args"
"k8s.io/kubernetes/cmd/libs/go2idl/conversion-gen/generators"
"k8s.io/kube-gen/cmd/conversion-gen/generators"
"github.com/golang/glog"
"github.com/spf13/pflag"

13
cmd/libs/go2idl/deepcopy-gen/BUILD → staging/src/k8s.io/kube-gen/cmd/deepcopy-gen/BUILD
View File

@@ -25,16 +25,3 @@ go_library(
"//vendor/k8s.io/gengo/examples/deepcopy-gen/generators:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)

0
cmd/libs/go2idl/deepcopy-gen/main.go → staging/src/k8s.io/kube-gen/cmd/deepcopy-gen/main.go
View File

13
cmd/libs/go2idl/defaulter-gen/BUILD → staging/src/k8s.io/kube-gen/cmd/defaulter-gen/BUILD
View File

@@ -25,16 +25,3 @@ go_library(
"//vendor/k8s.io/gengo/examples/defaulter-gen/generators:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)

0
cmd/libs/go2idl/defaulter-gen/main.go → staging/src/k8s.io/kube-gen/cmd/defaulter-gen/main.go
View File

0
cmd/libs/go2idl/go-to-protobuf/.gitignore → staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/.gitignore vendored
View File

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