move openapi types to pkg/openapi

This commit is contained in:
deads2k
2017-01-12 09:55:53 -05:00
parent dd7cd951ce
commit 7993e7c8aa
72 changed files with 2707 additions and 6761 deletions

View File

@@ -20,7 +20,7 @@ go_library(
"//vendor:github.com/gogo/protobuf/proto",
"//vendor:github.com/golang/glog",
"//vendor:github.com/google/gofuzz",
"//vendor:k8s.io/apimachinery/pkg/genericapiserver/openapi/common",
"//vendor:k8s.io/apimachinery/pkg/openapi",
],
)

View File

@@ -24,7 +24,7 @@ import (
"strconv"
"strings"
"k8s.io/apimachinery/pkg/genericapiserver/openapi/common"
"k8s.io/apimachinery/pkg/openapi"
"github.com/go-openapi/spec"
"github.com/golang/glog"
@@ -120,8 +120,8 @@ func (intstr IntOrString) MarshalJSON() ([]byte, error) {
}
}
func (_ IntOrString) OpenAPIDefinition() common.OpenAPIDefinition {
return common.OpenAPIDefinition{
func (_ IntOrString) OpenAPIDefinition() openapi.OpenAPIDefinition {
return openapi.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Type: []string{"string"},