diff --git a/cmd/libs/go2idl/client-gen/generators/client_generator.go b/cmd/libs/go2idl/client-gen/generators/client_generator.go index b6791a0b875..cabd38d3dbf 100644 --- a/cmd/libs/go2idl/client-gen/generators/client_generator.go +++ b/cmd/libs/go2idl/client-gen/generators/client_generator.go @@ -22,13 +22,13 @@ import ( "path/filepath" "strings" - "k8s.io/kubernetes/cmd/libs/go2idl/args" + "k8s.io/gengo/args" 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/normalization" - "k8s.io/kubernetes/cmd/libs/go2idl/generator" - "k8s.io/kubernetes/cmd/libs/go2idl/namer" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/generator" + "k8s.io/gengo/namer" + "k8s.io/gengo/types" "k8s.io/kubernetes/pkg/api/unversioned" "github.com/golang/glog" diff --git a/cmd/libs/go2idl/client-gen/generators/fake/fake_client_generator.go b/cmd/libs/go2idl/client-gen/generators/fake/fake_client_generator.go index 1e866bf8582..6ed190b7376 100644 --- a/cmd/libs/go2idl/client-gen/generators/fake/fake_client_generator.go +++ b/cmd/libs/go2idl/client-gen/generators/fake/fake_client_generator.go @@ -24,8 +24,8 @@ import ( clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization" - "k8s.io/kubernetes/cmd/libs/go2idl/generator" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/generator" + "k8s.io/gengo/types" "k8s.io/kubernetes/pkg/api/unversioned" ) diff --git a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go index 6ecdca6a748..d5ae1d689b1 100644 --- a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go +++ b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go @@ -22,9 +22,9 @@ import ( "path/filepath" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization" - "k8s.io/kubernetes/cmd/libs/go2idl/generator" - "k8s.io/kubernetes/cmd/libs/go2idl/namer" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/generator" + "k8s.io/gengo/namer" + "k8s.io/gengo/types" "k8s.io/kubernetes/pkg/api/unversioned" ) diff --git a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_group.go b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_group.go index 59b947fcbfe..8e1bbd486b0 100644 --- a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_group.go +++ b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_group.go @@ -21,9 +21,9 @@ import ( "io" "path/filepath" - "k8s.io/kubernetes/cmd/libs/go2idl/generator" - "k8s.io/kubernetes/cmd/libs/go2idl/namer" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/generator" + "k8s.io/gengo/namer" + "k8s.io/gengo/types" ) // genFakeForGroup produces a file for a group client, e.g. ExtensionsClient for the extension group. diff --git a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go index 76c64fcd83e..cb2cde19058 100644 --- a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go +++ b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go @@ -21,9 +21,9 @@ import ( "path/filepath" "strings" - "k8s.io/kubernetes/cmd/libs/go2idl/generator" - "k8s.io/kubernetes/cmd/libs/go2idl/namer" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/generator" + "k8s.io/gengo/namer" + "k8s.io/gengo/types" ) // genFakeForType produces a file for each top-level type. diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go b/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go index df20c4d3258..339e806fd21 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go @@ -22,9 +22,9 @@ import ( "path/filepath" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization" - "k8s.io/kubernetes/cmd/libs/go2idl/generator" - "k8s.io/kubernetes/cmd/libs/go2idl/namer" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/generator" + "k8s.io/gengo/namer" + "k8s.io/gengo/types" "k8s.io/kubernetes/pkg/api/unversioned" ) diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_expansion.go b/cmd/libs/go2idl/client-gen/generators/generator_for_expansion.go index b255f4cc994..4125aaddf35 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_expansion.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_expansion.go @@ -22,8 +22,8 @@ import ( "path/filepath" "strings" - "k8s.io/kubernetes/cmd/libs/go2idl/generator" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/generator" + "k8s.io/gengo/types" ) // genExpansion produces a file for a group client, e.g. ExtensionsClient for the extension group. diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_group.go b/cmd/libs/go2idl/client-gen/generators/generator_for_group.go index 5735341a935..d4cb6a8a297 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_group.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_group.go @@ -20,9 +20,9 @@ import ( "io" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization" - "k8s.io/kubernetes/cmd/libs/go2idl/generator" - "k8s.io/kubernetes/cmd/libs/go2idl/namer" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/generator" + "k8s.io/gengo/namer" + "k8s.io/gengo/types" ) // genGroup produces a file for a group client, e.g. ExtensionsClient for the extension group. diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_type.go b/cmd/libs/go2idl/client-gen/generators/generator_for_type.go index 47dadd1c29f..14a9766a245 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_type.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_type.go @@ -21,9 +21,9 @@ import ( "path/filepath" "strings" - "k8s.io/kubernetes/cmd/libs/go2idl/generator" - "k8s.io/kubernetes/cmd/libs/go2idl/namer" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/generator" + "k8s.io/gengo/namer" + "k8s.io/gengo/types" ) // genClientForType produces a file for each top-level type. diff --git a/cmd/libs/go2idl/client-gen/generators/tags.go b/cmd/libs/go2idl/client-gen/generators/tags.go index 9008fcbc9d0..34aa77231fa 100644 --- a/cmd/libs/go2idl/client-gen/generators/tags.go +++ b/cmd/libs/go2idl/client-gen/generators/tags.go @@ -18,7 +18,7 @@ package generators import ( "github.com/golang/glog" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/types" ) // extractBoolTagOrDie gets the comment-tags for the key and asserts that, if diff --git a/cmd/libs/go2idl/client-gen/main.go b/cmd/libs/go2idl/client-gen/main.go index a44b275f225..a80ba1c3c6e 100644 --- a/cmd/libs/go2idl/client-gen/main.go +++ b/cmd/libs/go2idl/client-gen/main.go @@ -22,7 +22,7 @@ import ( "path/filepath" "strings" - "k8s.io/kubernetes/cmd/libs/go2idl/args" + "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/pkg/api/unversioned" diff --git a/cmd/libs/go2idl/conversion-gen/generators/conversion.go b/cmd/libs/go2idl/conversion-gen/generators/conversion.go index 07558130795..3606d5f8e1c 100644 --- a/cmd/libs/go2idl/conversion-gen/generators/conversion.go +++ b/cmd/libs/go2idl/conversion-gen/generators/conversion.go @@ -23,10 +23,10 @@ import ( "path/filepath" "strings" - "k8s.io/kubernetes/cmd/libs/go2idl/args" - "k8s.io/kubernetes/cmd/libs/go2idl/generator" - "k8s.io/kubernetes/cmd/libs/go2idl/namer" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/args" + "k8s.io/gengo/generator" + "k8s.io/gengo/namer" + "k8s.io/gengo/types" "k8s.io/kubernetes/pkg/util/sets" "github.com/golang/glog" diff --git a/cmd/libs/go2idl/conversion-gen/main.go b/cmd/libs/go2idl/conversion-gen/main.go index e4e8434f1ee..16612976352 100644 --- a/cmd/libs/go2idl/conversion-gen/main.go +++ b/cmd/libs/go2idl/conversion-gen/main.go @@ -35,7 +35,7 @@ limitations under the License. package main import ( - "k8s.io/kubernetes/cmd/libs/go2idl/args" + "k8s.io/gengo/args" "k8s.io/kubernetes/cmd/libs/go2idl/conversion-gen/generators" "github.com/golang/glog" diff --git a/cmd/libs/go2idl/deepcopy-gen/generators/deepcopy.go b/cmd/libs/go2idl/deepcopy-gen/generators/deepcopy.go index 3f78d643fd0..7fa514f863f 100644 --- a/cmd/libs/go2idl/deepcopy-gen/generators/deepcopy.go +++ b/cmd/libs/go2idl/deepcopy-gen/generators/deepcopy.go @@ -22,10 +22,10 @@ import ( "path/filepath" "strings" - "k8s.io/kubernetes/cmd/libs/go2idl/args" - "k8s.io/kubernetes/cmd/libs/go2idl/generator" - "k8s.io/kubernetes/cmd/libs/go2idl/namer" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/args" + "k8s.io/gengo/generator" + "k8s.io/gengo/namer" + "k8s.io/gengo/types" "k8s.io/kubernetes/pkg/util/sets" "github.com/golang/glog" diff --git a/cmd/libs/go2idl/deepcopy-gen/generators/deepcopy_test.go b/cmd/libs/go2idl/deepcopy-gen/generators/deepcopy_test.go index cafab0db656..434bcaee665 100644 --- a/cmd/libs/go2idl/deepcopy-gen/generators/deepcopy_test.go +++ b/cmd/libs/go2idl/deepcopy-gen/generators/deepcopy_test.go @@ -19,7 +19,7 @@ package generators import ( "testing" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/types" ) func Test_isRootedUnder(t *testing.T) { diff --git a/cmd/libs/go2idl/deepcopy-gen/main.go b/cmd/libs/go2idl/deepcopy-gen/main.go index b1c9fa0271d..c80adf74582 100644 --- a/cmd/libs/go2idl/deepcopy-gen/main.go +++ b/cmd/libs/go2idl/deepcopy-gen/main.go @@ -48,7 +48,7 @@ limitations under the License. package main import ( - "k8s.io/kubernetes/cmd/libs/go2idl/args" + "k8s.io/gengo/args" "k8s.io/kubernetes/cmd/libs/go2idl/deepcopy-gen/generators" "github.com/golang/glog" diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go index 76768ad4a6b..daac979c1e6 100644 --- a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go +++ b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go @@ -26,11 +26,11 @@ import ( "path/filepath" "strings" - "k8s.io/kubernetes/cmd/libs/go2idl/args" - "k8s.io/kubernetes/cmd/libs/go2idl/generator" - "k8s.io/kubernetes/cmd/libs/go2idl/namer" - "k8s.io/kubernetes/cmd/libs/go2idl/parser" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/args" + "k8s.io/gengo/generator" + "k8s.io/gengo/namer" + "k8s.io/gengo/parser" + "k8s.io/gengo/types" flag "github.com/spf13/pflag" ) diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/generator.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/generator.go index a4b4e82b020..330c6217721 100644 --- a/cmd/libs/go2idl/go-to-protobuf/protobuf/generator.go +++ b/cmd/libs/go2idl/go-to-protobuf/protobuf/generator.go @@ -27,9 +27,9 @@ import ( "github.com/golang/glog" - "k8s.io/kubernetes/cmd/libs/go2idl/generator" - "k8s.io/kubernetes/cmd/libs/go2idl/namer" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/generator" + "k8s.io/gengo/namer" + "k8s.io/gengo/types" ) // genProtoIDL produces a .proto IDL. diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/import_tracker.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/import_tracker.go index 91024aa3bda..08a991b1554 100644 --- a/cmd/libs/go2idl/go-to-protobuf/protobuf/import_tracker.go +++ b/cmd/libs/go2idl/go-to-protobuf/protobuf/import_tracker.go @@ -17,8 +17,8 @@ limitations under the License. package protobuf import ( - "k8s.io/kubernetes/cmd/libs/go2idl/namer" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/namer" + "k8s.io/gengo/types" ) type ImportTracker struct { diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/namer.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/namer.go index 02a2bfe7246..7ae5c614e39 100644 --- a/cmd/libs/go2idl/go-to-protobuf/protobuf/namer.go +++ b/cmd/libs/go2idl/go-to-protobuf/protobuf/namer.go @@ -21,9 +21,9 @@ import ( "reflect" "strings" - "k8s.io/kubernetes/cmd/libs/go2idl/generator" - "k8s.io/kubernetes/cmd/libs/go2idl/namer" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/generator" + "k8s.io/gengo/namer" + "k8s.io/gengo/types" ) type localNamer struct { diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/package.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/package.go index e94b7a77138..055d71577d0 100644 --- a/cmd/libs/go2idl/go-to-protobuf/protobuf/package.go +++ b/cmd/libs/go2idl/go-to-protobuf/protobuf/package.go @@ -25,8 +25,8 @@ import ( "reflect" "strings" - "k8s.io/kubernetes/cmd/libs/go2idl/generator" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/generator" + "k8s.io/gengo/types" ) func newProtobufPackage(packagePath, packageName string, generateAll bool, omitFieldTypes map[types.Name]struct{}) *protobufPackage { diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/tags.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/tags.go index 04283cfbc44..62f9002aed1 100644 --- a/cmd/libs/go2idl/go-to-protobuf/protobuf/tags.go +++ b/cmd/libs/go2idl/go-to-protobuf/protobuf/tags.go @@ -18,7 +18,7 @@ package protobuf import ( "github.com/golang/glog" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/types" ) // extractBoolTagOrDie gets the comment-tags for the key and asserts that, if diff --git a/cmd/libs/go2idl/import-boss/generators/import_restrict.go b/cmd/libs/go2idl/import-boss/generators/import_restrict.go index 6e084b58c16..e806e932964 100644 --- a/cmd/libs/go2idl/import-boss/generators/import_restrict.go +++ b/cmd/libs/go2idl/import-boss/generators/import_restrict.go @@ -28,10 +28,10 @@ import ( "sort" "strings" - "k8s.io/kubernetes/cmd/libs/go2idl/args" - "k8s.io/kubernetes/cmd/libs/go2idl/generator" - "k8s.io/kubernetes/cmd/libs/go2idl/namer" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/args" + "k8s.io/gengo/generator" + "k8s.io/gengo/namer" + "k8s.io/gengo/types" "github.com/golang/glog" ) diff --git a/cmd/libs/go2idl/import-boss/main.go b/cmd/libs/go2idl/import-boss/main.go index 9162744718d..c537ba2c636 100644 --- a/cmd/libs/go2idl/import-boss/main.go +++ b/cmd/libs/go2idl/import-boss/main.go @@ -58,7 +58,7 @@ package main import ( "os" - "k8s.io/kubernetes/cmd/libs/go2idl/args" + "k8s.io/gengo/args" "k8s.io/kubernetes/cmd/libs/go2idl/import-boss/generators" "github.com/golang/glog" diff --git a/cmd/libs/go2idl/set-gen/generators/sets.go b/cmd/libs/go2idl/set-gen/generators/sets.go index e670c4c5365..8b4e72fa409 100644 --- a/cmd/libs/go2idl/set-gen/generators/sets.go +++ b/cmd/libs/go2idl/set-gen/generators/sets.go @@ -20,10 +20,10 @@ package generators import ( "io" - "k8s.io/kubernetes/cmd/libs/go2idl/args" - "k8s.io/kubernetes/cmd/libs/go2idl/generator" - "k8s.io/kubernetes/cmd/libs/go2idl/namer" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/args" + "k8s.io/gengo/generator" + "k8s.io/gengo/namer" + "k8s.io/gengo/types" "github.com/golang/glog" ) diff --git a/cmd/libs/go2idl/set-gen/generators/tags.go b/cmd/libs/go2idl/set-gen/generators/tags.go index 9008fcbc9d0..34aa77231fa 100644 --- a/cmd/libs/go2idl/set-gen/generators/tags.go +++ b/cmd/libs/go2idl/set-gen/generators/tags.go @@ -18,7 +18,7 @@ package generators import ( "github.com/golang/glog" - "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/gengo/types" ) // extractBoolTagOrDie gets the comment-tags for the key and asserts that, if diff --git a/cmd/libs/go2idl/set-gen/main.go b/cmd/libs/go2idl/set-gen/main.go index 1ac88cfb7e8..b0462d93f8d 100644 --- a/cmd/libs/go2idl/set-gen/main.go +++ b/cmd/libs/go2idl/set-gen/main.go @@ -27,7 +27,7 @@ package main import ( "os" - "k8s.io/kubernetes/cmd/libs/go2idl/args" + "k8s.io/gengo/args" "k8s.io/kubernetes/cmd/libs/go2idl/set-gen/generators" "github.com/golang/glog"