github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33238 from mbohlool/openapi

Browse Source 
Automatic merge from submit-queue

Move openapi common code to genericapiserver/openapi/common

a follow up to #32622

Reference: #13414
This commit is contained in:
Kubernetes Submit Queue 2016-09-22 10:20:48 -07:00 committed by GitHub
commit a8053c7c59
11 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/libs/go2idl/openapi-gen/generators/openapi.go
View File

@ -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.

2
pkg/api/resource/quantity.go
View File

@ -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.

2
pkg/api/unversioned/time.go
View File

@ -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"

2
pkg/generated/openapi/zz_generated.openapi.go
View File

@ -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"
)

2
pkg/genericapiserver/config.go
View File

@ -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"

2
pkg/genericapiserver/genericapiserver.go
View File

@ -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"

0
cmd/libs/go2idl/openapi-gen/generators/common/common.go → pkg/genericapiserver/openapi/common/common.go
View File

0
cmd/libs/go2idl/openapi-gen/generators/common/doc.go → pkg/genericapiserver/openapi/common/doc.go
View File

2
pkg/genericapiserver/openapi/openapi.go
View File

@ -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"
)

2
pkg/genericapiserver/openapi/openapi_test.go
View File

@ -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"
)

2
pkg/util/intstr/intstr.go
View File

@ -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"