github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove dup pkg and update reference

Browse Source
This commit is contained in:
ymqytw
2017-08-31 21:32:12 -07:00
parent 006f80e35d
commit 93be3f7735
21 changed files with 112 additions and 933 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubectl/cmd/util/openapi/openapi_getter.go
View File

@@ -20,13 +20,14 @@ import (
"sync"
"k8s.io/client-go/discovery"
openapi "k8s.io/kube-openapi/pkg/util/proto"
)
// synchronizedOpenAPIGetter fetches the openapi schema once and then caches it in memory
type synchronizedOpenAPIGetter struct {
// Cached results
sync.Once
openAPISchema Resources
openAPISchema openapi.Resources
err error
openAPIClient discovery.OpenAPISchemaInterface
@@ -37,7 +38,7 @@ var _ Getter = &synchronizedOpenAPIGetter{}
// Getter is an interface for fetching openapi specs and parsing them into an Resources struct
type Getter interface {
// OpenAPIData returns the parsed OpenAPIData
Get() (Resources, error)
Get() (openapi.Resources, error)
}
// NewOpenAPIGetter returns an object to return OpenAPIDatas which reads
@@ -49,7 +50,7 @@ func NewOpenAPIGetter(openAPIClient discovery.OpenAPISchemaInterface) Getter {
}
// Resources implements Getter
func (g *synchronizedOpenAPIGetter) Get() (Resources, error) {
func (g *synchronizedOpenAPIGetter) Get() (openapi.Resources, error) {
g.Do(func() {
s, err := g.openAPIClient.OpenAPISchema()
if err != nil {
@@ -57,7 +58,7 @@ func (g *synchronizedOpenAPIGetter) Get() (Resources, error) {
return
}
g.openAPISchema, g.err = NewOpenAPIData(s)
g.openAPISchema, g.err = openapi.NewOpenAPIData(s, ParseGroupVersionKind)
})
// Return the save result