From 52a96d95c039d38171463a434fe604bd5ff3daad Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Wed, 21 Sep 2016 13:56:00 -0700 Subject: [PATCH] use gengo dep --- cmd/libs/go2idl/openapi-gen/generators/openapi.go | 8 ++++---- cmd/libs/go2idl/openapi-gen/generators/openapi_test.go | 8 ++++---- cmd/libs/go2idl/openapi-gen/main.go | 5 ++++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/cmd/libs/go2idl/openapi-gen/generators/openapi.go b/cmd/libs/go2idl/openapi-gen/generators/openapi.go index fa50ad30e49..f2e8dec5353 100644 --- a/cmd/libs/go2idl/openapi-gen/generators/openapi.go +++ b/cmd/libs/go2idl/openapi-gen/generators/openapi.go @@ -25,10 +25,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" "k8s.io/kubernetes/pkg/genericapiserver/openapi/common" "k8s.io/kubernetes/pkg/util/sets" diff --git a/cmd/libs/go2idl/openapi-gen/generators/openapi_test.go b/cmd/libs/go2idl/openapi-gen/generators/openapi_test.go index 7586fc256d1..613856d61bc 100644 --- a/cmd/libs/go2idl/openapi-gen/generators/openapi_test.go +++ b/cmd/libs/go2idl/openapi-gen/generators/openapi_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/assert" - "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/generator" + "k8s.io/gengo/namer" + "k8s.io/gengo/parser" + "k8s.io/gengo/types" ) func construct(t *testing.T, files map[string]string, testNamer namer.Namer) (*parser.Builder, types.Universe, []*types.Type) { diff --git a/cmd/libs/go2idl/openapi-gen/main.go b/cmd/libs/go2idl/openapi-gen/main.go index cc749443d60..ccf861d8687 100644 --- a/cmd/libs/go2idl/openapi-gen/main.go +++ b/cmd/libs/go2idl/openapi-gen/main.go @@ -20,7 +20,9 @@ limitations under the License. package main import ( - "k8s.io/kubernetes/cmd/libs/go2idl/args" + "path/filepath" + + "k8s.io/gengo/args" "k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen/generators" "github.com/golang/glog" @@ -31,6 +33,7 @@ func main() { // Override defaults. arguments.OutputFileBaseName = "openapi_generated" + arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt") // Run it. if err := arguments.Execute(