Skip to content

Commit da36aea

Browse files
mfojtikironcladlou
mfojtik
authored and
ironcladlou
committed
UPSTREAM: 49114: Move generators to staging/src/k8s.io/kube-gen
:100644 000000 6a13076b0f... 0000000000... D cmd/libs/go2idl/client-gen/BUILD :100644 000000 f55c5f3527... 0000000000... D cmd/libs/go2idl/client-gen/args/BUILD :100644 100644 e99d0cd730... 944b94619c... M pkg/generated/openapi/BUILD :100644 100644 b7919d7762... a8a02c8ce9... M pkg/generated/openapi/def.bzl :100755 100755 04930a38c2... 0a05d7c8f2... M staging/prime-apimachinery.sh :100755 100755 fae9395fc4... 7a30bf1356... M staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh :100755 100755 68c4e2c4d1... f5835c4253... M staging/src/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh :100644 100644 97b4bb9082... 255ffdd112... M staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD :100644 100644 2599851c92... f7a280ec77... M staging/src/k8s.io/apimachinery/pkg/util/sets/types/types.go :100644 100644 bb8c30f2b9... 149f11f8b1... M staging/src/k8s.io/apiserver/pkg/server/openapi/openapi.go :100755 100755 78b3e9266c... a8b1f5c6d8... M staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh :100755 100755 4c6f51af8b... 4678e5e3c9... M staging/src/k8s.io/kube-aggregator/hack/verify-codegen.sh :100644 100644 0967ef424b... 0967ef424b... R100 cmd/libs/go2idl/client-gen/.import-restrictions staging/src/k8s.io/kube-gen/cmd/client-gen/.import-restrictions :000000 100644 0000000000... 5a86367a40... A staging/src/k8s.io/kube-gen/cmd/client-gen/BUILD :100644 100644 0c408a1aa9... 0c408a1aa9... R100 cmd/libs/go2idl/client-gen/OWNERS staging/src/k8s.io/kube-gen/cmd/client-gen/OWNERS :100644 100644 0174fb1f45... 44e742de9d... R069 cmd/libs/go2idl/client-gen/README.md staging/src/k8s.io/kube-gen/cmd/client-gen/README.md :000000 100644 0000000000... 70f3ae8b86... A staging/src/k8s.io/kube-gen/cmd/client-gen/args/BUILD :100644 100644 80de8f7228... 29dc92c9cd... R096 cmd/libs/go2idl/client-gen/args/args.go staging/src/k8s.io/kube-gen/cmd/client-gen/args/args.go :100644 100644 72b1eb726b... 7434355835... R051 cmd/libs/go2idl/client-gen/generators/BUILD staging/src/k8s.io/kube-gen/cmd/client-gen/generators/BUILD :100644 100644 11d25f0bae... 448d88da3f... R098 cmd/libs/go2idl/client-gen/generators/client_generator.go staging/src/k8s.io/kube-gen/cmd/client-gen/generators/client_generator.go :100644 100644 08ad1ac1da... c39ef73d34... R056 cmd/libs/go2idl/client-gen/generators/fake/BUILD staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/BUILD :100644 100644 82ad85a99c... 7b3817fb93... R095 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 :100644 100644 0073059453... 665c88a583... R098 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 :100644 100644 0b1409dd75... 0b1409dd75... R100 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 :100644 100644 9961c9797a... b670a15152... R099 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 :100644 100644 4a22ac79c9... 37def92ba0... R099 cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go staging/src/k8s.io/kube-gen/cmd/client-gen/generators/generator_for_clientset.go :100644 100644 67bac65735... 67bac65735... R100 cmd/libs/go2idl/client-gen/generators/generator_for_expansion.go staging/src/k8s.io/kube-gen/cmd/client-gen/generators/generator_for_expansion.go :100644 100644 c419ad2514... c10f13f9f6... R099 cmd/libs/go2idl/client-gen/generators/generator_for_group.go staging/src/k8s.io/kube-gen/cmd/client-gen/generators/generator_for_group.go :100644 100644 be2c9908a7... be2c9908a7... R100 cmd/libs/go2idl/client-gen/generators/generator_for_type.go staging/src/k8s.io/kube-gen/cmd/client-gen/generators/generator_for_type.go :100644 100644 d3f058386c... 6ad451a369... R055 cmd/libs/go2idl/client-gen/generators/scheme/BUILD staging/src/k8s.io/kube-gen/cmd/client-gen/generators/scheme/BUILD :100644 100644 e4a2b02e14... d703024d68... R098 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 :100644 100644 063559c09e... 063559c09e... R100 cmd/libs/go2idl/client-gen/generators/tags.go staging/src/k8s.io/kube-gen/cmd/client-gen/generators/tags.go :100644 100644 1e20f11b3b... 9af8c9f8c9... R094 cmd/libs/go2idl/client-gen/main.go staging/src/k8s.io/kube-gen/cmd/client-gen/main.go :100644 100644 1c967c9b84... 36379c6165... R050 cmd/libs/go2idl/client-gen/path/BUILD staging/src/k8s.io/kube-gen/cmd/client-gen/path/BUILD :100644 100644 19b269bdf2... 19b269bdf2... R100 cmd/libs/go2idl/client-gen/path/path.go staging/src/k8s.io/kube-gen/cmd/client-gen/path/path.go :100644 100644 e208378871... 9a56c482c6... R086 cmd/libs/go2idl/client-gen/test_apis/testgroup/doc.go staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/doc.go :100644 100644 c7f37c07b3... 3a6e00d6cc... R081 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 :100644 100644 df25d849b1... df25d849b1... R100 cmd/libs/go2idl/client-gen/test_apis/testgroup/register.go staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/register.go :100644 100644 8e0137348d... 8e0137348d... R100 cmd/libs/go2idl/client-gen/test_apis/testgroup/types.go staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/types.go :100644 100644 f6ab83e211... f6ab83e211... R100 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 :100644 100644 98c057c42e... 98c057c42e... R100 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 :100644 100644 96e30452bc... 96e30452bc... R100 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 :100644 100644 477ded4dbe... 7af83bbc98... R094 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 :100644 100644 2d1ecdad6d... 2d1ecdad6d... R100 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 :100644 100644 e1529933d4... 83d0afd267... R082 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 :100644 100644 5f565b3c8d... 5f565b3c8d... R100 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 :100644 100644 e22ecdb130... ab9c7553c0... R094 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 :100644 100644 5d8ec824f0... 5d8ec824f0... R100 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 :100644 100644 d59edd0bfc... f7a4896ccb... R094 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 :100644 100644 57e5b70cf5... 57e5b70cf5... R100 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 :100644 100644 c6548330a0... c6548330a0... R100 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 :100644 100644 f8ed8e9aba... d99e323d8b... R087 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 :100644 100644 ec274fda8b... 4d57a18b9b... R098 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 :100644 100644 163992082d... 163992082d... R100 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 :100644 100644 64c66351b3... 22dab51cd5... R095 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 :100644 100644 2193059d86... daad70275c... R096 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 :100644 100644 9fe181571b... 030984f0d8... R068 cmd/libs/go2idl/client-gen/types/BUILD staging/src/k8s.io/kube-gen/cmd/client-gen/types/BUILD :100644 100644 618a0737ae... 618a0737ae... R100 cmd/libs/go2idl/client-gen/types/helpers.go staging/src/k8s.io/kube-gen/cmd/client-gen/types/helpers.go :100644 100644 dec62dff21... dec62dff21... R100 cmd/libs/go2idl/client-gen/types/helpers_test.go staging/src/k8s.io/kube-gen/cmd/client-gen/types/helpers_test.go :100644 100644 135ea5a242... 135ea5a242... R100 cmd/libs/go2idl/client-gen/types/types.go staging/src/k8s.io/kube-gen/cmd/client-gen/types/types.go :100644 100644 c790cd13d8... 9abbb92963... R073 cmd/libs/go2idl/conversion-gen/generators/BUILD staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators/BUILD :100644 100644 83ea0e7dd4... 83ea0e7dd4... R100 cmd/libs/go2idl/conversion-gen/generators/conversion.go staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators/conversion.go :100644 100644 77cd7e5276... 7b14fe5baa... R097 cmd/libs/go2idl/conversion-gen/main.go staging/src/k8s.io/kube-gen/cmd/conversion-gen/main.go :100644 100644 f270bff382... f270bff382... R100 cmd/libs/go2idl/deepcopy-gen/main.go staging/src/k8s.io/kube-gen/cmd/deepcopy-gen/main.go :100644 100644 b12e58376e... b12e58376e... R100 cmd/libs/go2idl/defaulter-gen/main.go staging/src/k8s.io/kube-gen/cmd/defaulter-gen/main.go :100644 100644 66a0107882... e9b11d2a4f... R093 cmd/libs/go2idl/go-to-protobuf/main.go staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/main.go :100644 100644 8946b24a47... ed1f50327c... R082 cmd/libs/go2idl/go-to-protobuf/protobuf/BUILD staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf/BUILD :100644 100644 975310953a... 975310953a... R100 cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf/cmd.go :100644 100644 a76d670387... a76d670387... R100 cmd/libs/go2idl/go-to-protobuf/protobuf/generator.go staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf/generator.go :100644 100644 08a991b155... 08a991b155... R100 cmd/libs/go2idl/go-to-protobuf/protobuf/import_tracker.go staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf/import_tracker.go :100644 100644 423577a12e... 423577a12e... R100 cmd/libs/go2idl/go-to-protobuf/protobuf/namer.go staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf/namer.go :100644 100644 0ee71f80be... 0ee71f80be... R100 cmd/libs/go2idl/go-to-protobuf/protobuf/namer_test.go staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf/namer_test.go :100644 100644 bed4c3e306... bed4c3e306... R100 cmd/libs/go2idl/go-to-protobuf/protobuf/package.go staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf/package.go :100644 100644 c8c01cdff6... c8c01cdff6... R100 cmd/libs/go2idl/go-to-protobuf/protobuf/parser.go staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf/parser.go :100644 100644 62f9002aed... 62f9002aed... R100 cmd/libs/go2idl/go-to-protobuf/protobuf/tags.go staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf/tags.go :100644 100644 76e877bf3a... bef52814be... R074 cmd/libs/go2idl/go-to-protobuf/protoc-gen-gogo/BUILD staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protoc-gen-gogo/BUILD :100644 100644 6e5051dce1... 6e5051dce1... R100 cmd/libs/go2idl/go-to-protobuf/protoc-gen-gogo/main.go staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protoc-gen-gogo/main.go :100644 100644 db9505e52b... db9505e52b... R100 cmd/libs/go2idl/import-boss/main.go staging/src/k8s.io/kube-gen/cmd/import-boss/main.go :100644 100644 3c8585e697... 5d2e3861c4... R074 cmd/libs/go2idl/informer-gen/generators/BUILD staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/BUILD :100644 100644 f39c96da74... f39c96da74... R100 cmd/libs/go2idl/informer-gen/generators/customargs.go staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/customargs.go :100644 100644 b9dad9b4d5... 4b81aa00d9... R098 cmd/libs/go2idl/informer-gen/generators/factory.go staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/factory.go :100644 100644 011fea20b3... 011fea20b3... R100 cmd/libs/go2idl/informer-gen/generators/factoryinterface.go staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/factoryinterface.go :100644 100644 90af252f8b... 9feb3df86c... R098 cmd/libs/go2idl/informer-gen/generators/generic.go staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/generic.go :100644 100644 b1934210f8... 2d2c9b3b7b... R097 cmd/libs/go2idl/informer-gen/generators/groupinterface.go staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/groupinterface.go :100644 100644 e48be0fce5... 838f68e270... R098 cmd/libs/go2idl/informer-gen/generators/informer.go staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/informer.go :100644 100644 71d6cd472f... cb0e3d32dd... R099 cmd/libs/go2idl/informer-gen/generators/packages.go staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/packages.go :100644 100644 34aa77231f... 34aa77231f... R100 cmd/libs/go2idl/informer-gen/generators/tags.go staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/tags.go :100644 100644 5a58dc5138... 5a58dc5138... R100 cmd/libs/go2idl/informer-gen/generators/types.go staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/types.go :100644 100644 23f7286f0f... 23f7286f0f... R100 cmd/libs/go2idl/informer-gen/generators/versioninterface.go staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/versioninterface.go :100644 100644 5bde903cfe... 91fc9cc96b... R096 cmd/libs/go2idl/informer-gen/main.go staging/src/k8s.io/kube-gen/cmd/informer-gen/main.go :100644 100644 ce69a8aad5... 3544fb3f77... R067 cmd/libs/go2idl/lister-gen/generators/BUILD staging/src/k8s.io/kube-gen/cmd/lister-gen/generators/BUILD :100644 100644 67ac832211... 67ac832211... R100 cmd/libs/go2idl/lister-gen/generators/expansion.go staging/src/k8s.io/kube-gen/cmd/lister-gen/generators/expansion.go :100644 100644 fb40fff45f... 7b66df7a41... R099 cmd/libs/go2idl/lister-gen/generators/lister.go staging/src/k8s.io/kube-gen/cmd/lister-gen/generators/lister.go :100644 100644 34aa77231f... 34aa77231f... R100 cmd/libs/go2idl/lister-gen/generators/tags.go staging/src/k8s.io/kube-gen/cmd/lister-gen/generators/tags.go :100644 100644 88ba462acd... 4af9d97b32... R095 cmd/libs/go2idl/lister-gen/main.go staging/src/k8s.io/kube-gen/cmd/lister-gen/main.go :100644 100644 a0fdefe276... db51ec8763... R082 cmd/libs/go2idl/openapi-gen/generators/BUILD staging/src/k8s.io/kube-gen/cmd/openapi-gen/generators/BUILD :100644 100644 9d7d232f76... 9d7d232f76... R100 cmd/libs/go2idl/openapi-gen/generators/openapi.go staging/src/k8s.io/kube-gen/cmd/openapi-gen/generators/openapi.go :100644 100644 70e52ea1ac... 70e52ea1ac... R100 cmd/libs/go2idl/openapi-gen/generators/openapi_test.go staging/src/k8s.io/kube-gen/cmd/openapi-gen/generators/openapi_test.go :100644 100644 ccf861d868... b56bab79e2... R096 cmd/libs/go2idl/openapi-gen/main.go staging/src/k8s.io/kube-gen/cmd/openapi-gen/main.go :100644 100644 b9e66abcaa... b9e66abcaa... R100 cmd/libs/go2idl/set-gen/main.go staging/src/k8s.io/kube-gen/cmd/set-gen/main.go :100755 100755 785ece8eed... 09d670bb40... M staging/src/k8s.io/metrics/hack/update-codegen.sh :100755 100755 fcb45ca244... f5835c4253... M staging/src/k8s.io/metrics/hack/verify-codegen.sh :100755 100755 8de8bef398... 918e9f80f9... M staging/src/k8s.io/sample-apiserver/hack/update-codegen.sh :100755 100755 0ca0c01018... f5835c4253... M staging/src/k8s.io/sample-apiserver/hack/verify-codegen.sh :000000 120000 0000000000... c57d0e8c38... A vendor/k8s.io/kube-gen
1 parent 1937f78 commit da36aea

File tree

105 files changed

+205
-388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+205
-388
lines changed

‎cmd/libs/go2idl/client-gen/BUILD

-50
This file was deleted.

‎cmd/libs/go2idl/client-gen/args/BUILD

-28
This file was deleted.

‎pkg/generated/openapi/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ openapi_library(
88
name = "go_default_library",
99
srcs = ["doc.go"],
1010
openapi_targets = [
11-
"cmd/libs/go2idl/client-gen/test_apis/testgroup/v1",
1211
"federation/apis/federation/v1beta1",
1312
"pkg/api/v1",
1413
"pkg/apis/abac/v0",
@@ -49,6 +48,7 @@ openapi_library(
4948
"k8s.io/apiserver/pkg/apis/example/v1",
5049
"k8s.io/client-go/pkg/api/v1",
5150
"k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1",
51+
"k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1",
5252
"k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1",
5353
"k8s.io/metrics/pkg/apis/metrics/v1alpha1",
5454
],

‎pkg/generated/openapi/def.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def openapi_library(name, tags, srcs, openapi_targets=[], vendor_targets=[]):
1717
srcs = srcs + ["//hack/boilerplate:boilerplate.go.txt"],
1818
outs = ["zz_generated.openapi.go"],
1919
cmd = " ".join([
20-
"$(location //cmd/libs/go2idl/openapi-gen)",
20+
"$(location //vendor/k8s.io/kube-gen/cmd/openapi-gen)",
2121
"--v 1",
2222
"--logtostderr",
2323
"--go-header-file $(location //hack/boilerplate:boilerplate.go.txt)",
@@ -27,5 +27,5 @@ def openapi_library(name, tags, srcs, openapi_targets=[], vendor_targets=[]):
2727
"&& cp pkg/generated/openapi/zz_generated.openapi.go $(GENDIR)/pkg/generated/openapi",
2828
]),
2929
go_deps = deps,
30-
tools = ["//cmd/libs/go2idl/openapi-gen"],
30+
tools = ["//vendor/k8s.io/kube-gen/cmd/openapi-gen"],
3131
)

‎staging/prime-apimachinery.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ while read package; do
7272
done <${dir}/packages.txt
7373

7474
# this file generates something or other, but we don't want to accidentally have it generate into an apimachinery package
75-
git checkout cmd/libs/go2idl/set-gen/main.go
75+
git checkout vendor/k8s.io/kube-gen/cmd/set-gen/main.go
7676

7777

7878
# now run gofmt to get the sorting right

‎staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh

+10-10
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../..
22-
APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/..
23-
source "${KUBE_ROOT}/hack/lib/init.sh"
21+
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
22+
SCRIPT_BASE=${SCRIPT_ROOT}/../..
23+
KUBEGEN_PKG=${KUBEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/kube-gen 2>/dev/null || echo k8s.io/kube-gen)}
2424

2525
if LANG=C sed --help 2>&1 | grep -q GNU; then
2626
SED="sed"
@@ -41,7 +41,7 @@ trap cleanup EXIT
4141

4242
echo "Building client-gen"
4343
CLIENTGEN="${PWD}/client-gen-binary"
44-
go build -o "${CLIENTGEN}" ./cmd/libs/go2idl/client-gen
44+
go build -o "${CLIENTGEN}" ${KUBEGEN_PKG}/cmd/client-gen
4545

4646
PREFIX=k8s.io/apiextensions-apiserver/pkg/apis
4747
INPUT_BASE="--input-base ${PREFIX}"
@@ -52,25 +52,25 @@ apiextensions/v1beta1
5252
INPUT="--input ${INPUT_APIS[@]}"
5353
CLIENTSET_PATH="--clientset-path k8s.io/apiextensions-apiserver/pkg/client/clientset"
5454

55-
${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor
56-
${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiextensions/v1beta1 ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor
55+
${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${SCRIPT_BASE}
56+
${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiextensions/v1beta1 ${CLIENTSET_PATH} --output-base ${SCRIPT_BASE}
5757

5858

5959
echo "Building lister-gen"
6060
listergen="${PWD}/lister-gen"
61-
go build -o "${listergen}" ./cmd/libs/go2idl/lister-gen
61+
go build -o "${listergen}" ${KUBEGEN_PKG}/cmd/lister-gen
6262

6363
LISTER_INPUT="--input-dirs k8s.io/apiextensions-apiserver/pkg/apis/apiextensions --input-dirs k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
6464
LISTER_PATH="--output-package k8s.io/apiextensions-apiserver/pkg/client/listers"
65-
${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${KUBE_ROOT}/vendor
65+
${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${SCRIPT_BASE}
6666

6767

6868
echo "Building informer-gen"
6969
informergen="${PWD}/informer-gen"
70-
go build -o "${informergen}" ./cmd/libs/go2idl/informer-gen
70+
go build -o "${informergen}" ${KUBEGEN_PKG}/cmd/informer-gen
7171

7272
${informergen} \
73-
--output-base ${KUBE_ROOT}/vendor \
73+
--output-base ${SCRIPT_BASE} \
7474
--input-dirs k8s.io/apiextensions-apiserver/pkg/apis/apiextensions --input-dirs k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1 \
7575
--versioned-clientset-package k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset \
7676
--internal-clientset-package k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset \

‎staging/src/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh

+6-7
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../..
22-
APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/..
23-
source "${KUBE_ROOT}/hack/lib/init.sh"
21+
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
22+
SCRIPT_BASE=${SCRIPT_ROOT}/../..
2423

25-
DIFFROOT="${APIFEDERATOR_ROOT}/pkg"
26-
TMP_DIFFROOT="${APIFEDERATOR_ROOT}/_tmp/pkg"
27-
_tmp="${APIFEDERATOR_ROOT}/_tmp"
24+
DIFFROOT="${SCRIPT_ROOT}/pkg"
25+
TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg"
26+
_tmp="${SCRIPT_ROOT}/_tmp"
2827

2928
cleanup() {
3029
rm -rf "${_tmp}"
@@ -36,7 +35,7 @@ cleanup
3635
mkdir -p "${TMP_DIFFROOT}"
3736
cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
3837

39-
"${APIFEDERATOR_ROOT}/hack/update-codegen.sh"
38+
"${SCRIPT_ROOT}/hack/update-codegen.sh"
4039
echo "diffing ${DIFFROOT} against freshly generated codegen"
4140
ret=0
4241
diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?

‎staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ go_genrule(
3636
"string.go",
3737
],
3838
cmd = """
39-
$(location //cmd/libs/go2idl/set-gen) \
39+
$(location //vendor/k8s.io/kube-gen/cmd/set-gen) \
4040
--input-dirs ./vendor/k8s.io/apimachinery/pkg/util/sets/types \
4141
--output-base $(GENDIR)/vendor/k8s.io/apimachinery/pkg/util \
4242
--go-header-file $(location //hack/boilerplate:boilerplate.go.txt) \
@@ -46,7 +46,7 @@ $(location //cmd/libs/go2idl/set-gen) \
4646
"//vendor/k8s.io/apimachinery/pkg/util/sets/types:go_default_library",
4747
],
4848
tools = [
49-
"//cmd/libs/go2idl/set-gen",
49+
"//vendor/k8s.io/kube-gen/cmd/set-gen",
5050
],
5151
)
5252

‎staging/src/k8s.io/apimachinery/pkg/util/sets/types/types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
// Package types just provides input types to the set generator. It also
1818
// contains a "go generate" block.
19-
// (You must first `go install k8s.io/kubernetes/cmd/libs/go2idl/set-gen`)
19+
// (You must first `go install k8s.io/kube-gen/cmd/set-gen`)
2020
package types
2121

2222
//go:generate set-gen -i k8s.io/kubernetes/pkg/util/sets/types

‎staging/src/k8s.io/apiserver/pkg/server/openapi/openapi.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func (o *openAPI) buildDefinitionRecursively(name string) error {
155155

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

‎staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh

+11-10
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../..
22-
APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/..
23-
source "${KUBE_ROOT}/hack/lib/init.sh"
21+
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
22+
SCRIPT_BASE=${SCRIPT_ROOT}/../..
23+
KUBEGEN_PKG=${KUBEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/kube-gen 2>/dev/null || echo k8s.io/kube-gen)}
2424

2525
if LANG=C sed --help 2>&1 | grep -q GNU; then
2626
SED="sed"
@@ -41,7 +41,8 @@ trap cleanup EXIT
4141

4242
echo "Building client-gen"
4343
CLIENTGEN="${PWD}/client-gen-binary"
44-
go build -o "${CLIENTGEN}" ./cmd/libs/go2idl/client-gen
44+
45+
go build -o "${CLIENTGEN}" ${KUBEGEN_PKG}/cmd/client-gen
4546

4647
PREFIX=k8s.io/kube-aggregator/pkg/apis
4748
INPUT_BASE="--input-base ${PREFIX}"
@@ -52,25 +53,25 @@ apiregistration/v1beta1
5253
INPUT="--input ${INPUT_APIS[@]}"
5354
CLIENTSET_PATH="--clientset-path k8s.io/kube-aggregator/pkg/client/clientset_generated"
5455

55-
${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor
56-
${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiregistration/v1beta1 ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor
56+
${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${SCRIPT_BASE}
57+
${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiregistration/v1beta1 ${CLIENTSET_PATH} --output-base ${SCRIPT_BASE}
5758

5859

5960
echo "Building lister-gen"
6061
listergen="${PWD}/lister-gen"
61-
go build -o "${listergen}" ./cmd/libs/go2idl/lister-gen
62+
go build -o "${listergen}" ${KUBEGEN_PKG}/cmd/lister-gen
6263

6364
LISTER_INPUT="--input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
6465
LISTER_PATH="--output-package k8s.io/kube-aggregator/pkg/client/listers"
65-
${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${KUBE_ROOT}/vendor
66+
${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${SCRIPT_BASE}
6667

6768

6869
echo "Building informer-gen"
6970
informergen="${PWD}/informer-gen"
70-
go build -o "${informergen}" ./cmd/libs/go2idl/informer-gen
71+
go build -o "${informergen}" ${KUBEGEN_PKG}/cmd/informer-gen
7172

7273
${informergen} \
73-
--output-base ${KUBE_ROOT}/vendor \
74+
--output-base ${SCRIPT_BASE} \
7475
--input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1 \
7576
--versioned-clientset-package k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset \
7677
--internal-clientset-package k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset \

‎staging/src/k8s.io/kube-aggregator/hack/verify-codegen.sh

+6-7
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../..
22-
APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/..
23-
source "${KUBE_ROOT}/hack/lib/init.sh"
21+
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
22+
SCRIPT_BASE=${SCRIPT_ROOT}/../..
2423

25-
DIFFROOT="${APIFEDERATOR_ROOT}/pkg"
26-
TMP_DIFFROOT="${APIFEDERATOR_ROOT}/_tmp/pkg"
27-
_tmp="${APIFEDERATOR_ROOT}/_tmp"
24+
DIFFROOT="${SCRIPT_ROOT}/pkg"
25+
TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg"
26+
_tmp="${SCRIPT_ROOT}/_tmp"
2827

2928
cleanup() {
3029
rm -rf "${_tmp}"
@@ -36,7 +35,7 @@ cleanup
3635
mkdir -p "${TMP_DIFFROOT}"
3736
cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
3837

39-
"${APIFEDERATOR_ROOT}/hack/update-codegen.sh"
38+
"${SCRIPT_ROOT}/hack/update-codegen.sh"
4039
echo "diffing ${DIFFROOT} against freshly generated codegen"
4140
ret=0
4241
diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?

‎cmd/libs/go2idl/client-gen/.import-restrictions renamed to ‎staging/src/k8s.io/kube-gen/cmd/client-gen/.import-restrictions

File renamed without changes.

‎staging/src/k8s.io/kube-gen/cmd/client-gen/BUILD

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package(default_visibility = ["//visibility:public"])
2+
3+
licenses(["notice"])
4+
5+
load(
6+
"@io_bazel_rules_go//go:def.bzl",
7+
"go_binary",
8+
"go_library",
9+
)
10+
11+
go_binary(
12+
name = "client-gen",
13+
library = ":go_default_library",
14+
tags = ["automanaged"],
15+
)
16+
17+
go_library(
18+
name = "go_default_library",
19+
srcs = ["main.go"],
20+
tags = ["automanaged"],
21+
deps = [
22+
"//vendor/github.com/golang/glog:go_default_library",
23+
"//vendor/github.com/spf13/pflag:go_default_library",
24+
"//vendor/k8s.io/gengo/args:go_default_library",
25+
"//vendor/k8s.io/kube-gen/cmd/client-gen/args:go_default_library",
26+
"//vendor/k8s.io/kube-gen/cmd/client-gen/generators:go_default_library",
27+
"//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library",
28+
],
29+
)

‎cmd/libs/go2idl/client-gen/OWNERS renamed to ‎staging/src/k8s.io/kube-gen/cmd/client-gen/OWNERS

File renamed without changes.

‎cmd/libs/go2idl/client-gen/README.md renamed to ‎staging/src/k8s.io/kube-gen/cmd/client-gen/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
See [generating-clientset.md](https://kubernetes.io/docs/devel/generating-clientset.md)
22

33

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

‎staging/src/k8s.io/kube-gen/cmd/client-gen/args/BUILD

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package(default_visibility = ["//visibility:public"])
2+
3+
licenses(["notice"])
4+
5+
load(
6+
"@io_bazel_rules_go//go:def.bzl",
7+
"go_library",
8+
)
9+
10+
go_library(
11+
name = "go_default_library",
12+
srcs = ["args.go"],
13+
tags = ["automanaged"],
14+
deps = ["//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library"],
15+
)

‎cmd/libs/go2idl/client-gen/args/args.go renamed to ‎staging/src/k8s.io/kube-gen/cmd/client-gen/args/args.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
package args
1818

19-
import "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
19+
import "k8s.io/kube-gen/cmd/client-gen/types"
2020

2121
// ClientGenArgs is a wrapper for arguments to client-gen.
2222
type Args struct {

0 commit comments

Comments
 (0)