github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 15:13:08 +00:00
Code Issues 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

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