diff --git a/cmd/libs/go2idl/openapi-gen/generators/openapi.go b/cmd/libs/go2idl/openapi-gen/generators/openapi.go index 2f6de50ecd3..fa50ad30e49 100644 --- a/cmd/libs/go2idl/openapi-gen/generators/openapi.go +++ b/cmd/libs/go2idl/openapi-gen/generators/openapi.go @@ -28,8 +28,8 @@ import ( "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/openapi-gen/generators/common" "k8s.io/kubernetes/cmd/libs/go2idl/types" + "k8s.io/kubernetes/pkg/genericapiserver/openapi/common" "k8s.io/kubernetes/pkg/util/sets" "github.com/golang/glog" @@ -136,7 +136,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat const ( specPackagePath = "github.com/go-openapi/spec" - openAPICommonPackagePath = "k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen/generators/common" + openAPICommonPackagePath = "k8s.io/kubernetes/pkg/genericapiserver/openapi/common" ) // openApiGen produces a file with auto-generated OpenAPI functions. diff --git a/pkg/api/resource/quantity.go b/pkg/api/resource/quantity.go index 8c74569fc04..d8f2718ee5b 100644 --- a/pkg/api/resource/quantity.go +++ b/pkg/api/resource/quantity.go @@ -29,7 +29,7 @@ import ( "github.com/go-openapi/spec" inf "gopkg.in/inf.v0" - "k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen/generators/common" + "k8s.io/kubernetes/pkg/genericapiserver/openapi/common" ) // Quantity is a fixed-point representation of a number. diff --git a/pkg/api/unversioned/time.go b/pkg/api/unversioned/time.go index 83e8bb46582..636e24a3ba7 100644 --- a/pkg/api/unversioned/time.go +++ b/pkg/api/unversioned/time.go @@ -20,7 +20,7 @@ import ( "encoding/json" "time" - "k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen/generators/common" + "k8s.io/kubernetes/pkg/genericapiserver/openapi/common" "github.com/go-openapi/spec" "github.com/google/gofuzz" diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 30753049777..81c45f096f5 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -22,9 +22,9 @@ package openapi import ( spec "github.com/go-openapi/spec" - common "k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen/generators/common" resource "k8s.io/kubernetes/pkg/api/resource" unversioned "k8s.io/kubernetes/pkg/api/unversioned" + common "k8s.io/kubernetes/pkg/genericapiserver/openapi/common" intstr "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/pkg/genericapiserver/config.go b/pkg/genericapiserver/config.go index a1ab057c6c3..11a238ca37e 100644 --- a/pkg/genericapiserver/config.go +++ b/pkg/genericapiserver/config.go @@ -32,7 +32,6 @@ import ( "github.com/golang/glog" "gopkg.in/natefinch/lumberjack.v2" - "k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen/generators/common" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" @@ -42,6 +41,7 @@ import ( "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/auth/handlers" "k8s.io/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/genericapiserver/openapi/common" "k8s.io/kubernetes/pkg/genericapiserver/options" "k8s.io/kubernetes/pkg/genericapiserver/routes" genericvalidation "k8s.io/kubernetes/pkg/genericapiserver/validation" diff --git a/pkg/genericapiserver/genericapiserver.go b/pkg/genericapiserver/genericapiserver.go index 962d73dfae6..1e3b0843eb1 100644 --- a/pkg/genericapiserver/genericapiserver.go +++ b/pkg/genericapiserver/genericapiserver.go @@ -35,7 +35,6 @@ import ( "github.com/golang/glog" "github.com/go-openapi/spec" - "k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen/generators/common" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" @@ -44,6 +43,7 @@ import ( "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apiserver" "k8s.io/kubernetes/pkg/genericapiserver/openapi" + "k8s.io/kubernetes/pkg/genericapiserver/openapi/common" "k8s.io/kubernetes/pkg/genericapiserver/options" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/runtime" diff --git a/cmd/libs/go2idl/openapi-gen/generators/common/common.go b/pkg/genericapiserver/openapi/common/common.go similarity index 100% rename from cmd/libs/go2idl/openapi-gen/generators/common/common.go rename to pkg/genericapiserver/openapi/common/common.go diff --git a/cmd/libs/go2idl/openapi-gen/generators/common/doc.go b/pkg/genericapiserver/openapi/common/doc.go similarity index 100% rename from cmd/libs/go2idl/openapi-gen/generators/common/doc.go rename to pkg/genericapiserver/openapi/common/doc.go diff --git a/pkg/genericapiserver/openapi/openapi.go b/pkg/genericapiserver/openapi/openapi.go index 00ef9a50775..a6aae8f859f 100644 --- a/pkg/genericapiserver/openapi/openapi.go +++ b/pkg/genericapiserver/openapi/openapi.go @@ -25,7 +25,7 @@ import ( "github.com/emicklei/go-restful" "github.com/go-openapi/spec" - "k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen/generators/common" + "k8s.io/kubernetes/pkg/genericapiserver/openapi/common" "k8s.io/kubernetes/pkg/util/json" ) diff --git a/pkg/genericapiserver/openapi/openapi_test.go b/pkg/genericapiserver/openapi/openapi_test.go index 0eba12cfe76..2f6f0f37581 100644 --- a/pkg/genericapiserver/openapi/openapi_test.go +++ b/pkg/genericapiserver/openapi/openapi_test.go @@ -24,7 +24,7 @@ import ( "github.com/emicklei/go-restful" "github.com/go-openapi/spec" "github.com/stretchr/testify/assert" - "k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen/generators/common" + "k8s.io/kubernetes/pkg/genericapiserver/openapi/common" "sort" ) diff --git a/pkg/util/intstr/intstr.go b/pkg/util/intstr/intstr.go index 569dfa24a2d..248a16cc431 100644 --- a/pkg/util/intstr/intstr.go +++ b/pkg/util/intstr/intstr.go @@ -23,7 +23,7 @@ import ( "strconv" "strings" - "k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen/generators/common" + "k8s.io/kubernetes/pkg/genericapiserver/openapi/common" "github.com/go-openapi/spec" "github.com/google/gofuzz"