Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
37c10e2e
Commit
37c10e2e
authored
Jul 24, 2018
by
jennybuckley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Skip building openapi for ignored paths
parent
da1bb028
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
9 deletions
+25
-9
BUILD
staging/src/k8s.io/apiserver/pkg/endpoints/BUILD
+2
-0
installer.go
staging/src/k8s.io/apiserver/pkg/endpoints/installer.go
+23
-9
No files found.
staging/src/k8s.io/apiserver/pkg/endpoints/BUILD
View file @
37c10e2e
...
@@ -85,6 +85,8 @@ go_library(
...
@@ -85,6 +85,8 @@ go_library(
"//vendor/github.com/emicklei/go-restful:go_default_library",
"//vendor/github.com/emicklei/go-restful:go_default_library",
"//vendor/k8s.io/kube-openapi/pkg/builder:go_default_library",
"//vendor/k8s.io/kube-openapi/pkg/builder:go_default_library",
"//vendor/k8s.io/kube-openapi/pkg/common:go_default_library",
"//vendor/k8s.io/kube-openapi/pkg/common:go_default_library",
"//vendor/k8s.io/kube-openapi/pkg/util:go_default_library",
"//vendor/k8s.io/kube-openapi/pkg/util/proto:go_default_library",
],
],
)
)
...
...
staging/src/k8s.io/apiserver/pkg/endpoints/installer.go
View file @
37c10e2e
...
@@ -41,6 +41,8 @@ import (
...
@@ -41,6 +41,8 @@ import (
genericfilters
"k8s.io/apiserver/pkg/server/filters"
genericfilters
"k8s.io/apiserver/pkg/server/filters"
utilopenapi
"k8s.io/apiserver/pkg/util/openapi"
utilopenapi
"k8s.io/apiserver/pkg/util/openapi"
openapibuilder
"k8s.io/kube-openapi/pkg/builder"
openapibuilder
"k8s.io/kube-openapi/pkg/builder"
openapiutil
"k8s.io/kube-openapi/pkg/util"
openapiproto
"k8s.io/kube-openapi/pkg/util/proto"
)
)
const
(
const
(
...
@@ -498,15 +500,9 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag
...
@@ -498,15 +500,9 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag
if
a
.
group
.
MetaGroupVersion
!=
nil
{
if
a
.
group
.
MetaGroupVersion
!=
nil
{
reqScope
.
MetaGroupVersion
=
*
a
.
group
.
MetaGroupVersion
reqScope
.
MetaGroupVersion
=
*
a
.
group
.
MetaGroupVersion
}
}
if
a
.
group
.
OpenAPIConfig
!=
nil
{
reqScope
.
OpenAPISchema
,
err
=
a
.
getOpenAPISchema
(
ws
.
RootPath
(),
resource
,
fqKindToRegister
,
defaultVersionedObject
)
openAPIDefinitions
,
err
:=
openapibuilder
.
BuildOpenAPIDefinitionsForResource
(
defaultVersionedObject
,
a
.
group
.
OpenAPIConfig
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"unable to get openapi schema for %v: %v"
,
fqKindToRegister
,
err
)
return
nil
,
fmt
.
Errorf
(
"unable to build openapi definitions for %v: %v"
,
fqKindToRegister
,
err
)
}
reqScope
.
OpenAPISchema
,
err
=
utilopenapi
.
ToProtoSchema
(
openAPIDefinitions
,
fqKindToRegister
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"unable to get openapi schema for %v: %v"
,
fqKindToRegister
,
err
)
}
}
}
for
_
,
action
:=
range
actions
{
for
_
,
action
:=
range
actions
{
producedObject
:=
storageMeta
.
ProducesObject
(
action
.
Verb
)
producedObject
:=
storageMeta
.
ProducesObject
(
action
.
Verb
)
...
@@ -852,6 +848,24 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag
...
@@ -852,6 +848,24 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag
return
&
apiResource
,
nil
return
&
apiResource
,
nil
}
}
// getOpenAPISchema builds the openapi schema for a single resource model to be given to each handler. It will
// return nil if the apiserver doesn't have openapi enabled, or if the specific path should be ignored by openapi.
func
(
a
*
APIInstaller
)
getOpenAPISchema
(
rootPath
,
resource
string
,
kind
schema
.
GroupVersionKind
,
sampleObject
interface
{})
(
openapiproto
.
Schema
,
error
)
{
path
:=
gpath
.
Join
(
rootPath
,
resource
)
if
a
.
group
.
OpenAPIConfig
==
nil
{
return
nil
,
nil
}
pathsToIgnore
:=
openapiutil
.
NewTrie
(
a
.
group
.
OpenAPIConfig
.
IgnorePrefixes
)
if
pathsToIgnore
.
HasPrefix
(
path
)
{
return
nil
,
nil
}
openAPIDefinitions
,
err
:=
openapibuilder
.
BuildOpenAPIDefinitionsForResource
(
sampleObject
,
a
.
group
.
OpenAPIConfig
)
if
err
!=
nil
{
return
nil
,
err
}
return
utilopenapi
.
ToProtoSchema
(
openAPIDefinitions
,
kind
)
}
// indirectArbitraryPointer returns *ptrToObject for an arbitrary pointer
// indirectArbitraryPointer returns *ptrToObject for an arbitrary pointer
func
indirectArbitraryPointer
(
ptrToObject
interface
{})
interface
{}
{
func
indirectArbitraryPointer
(
ptrToObject
interface
{})
interface
{}
{
return
reflect
.
Indirect
(
reflect
.
ValueOf
(
ptrToObject
))
.
Interface
()
return
reflect
.
Indirect
(
reflect
.
ValueOf
(
ptrToObject
))
.
Interface
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment