scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 03:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup go2idl references

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-07-18 10:53:00 +02:00
parent 2e6be8583d
commit edfbb9aa64
90 changed files with 138 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

3
hack/verify-codegen.sh
View File

@@ -24,6 +24,9 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env
# call verify on sub-project for now
#
# 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.
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

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