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
b063e9f8
Commit
b063e9f8
authored
Jun 22, 2018
by
David Eads
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
legacy api endpoints only support v1 ever
parent
23b4690d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
16 deletions
+9
-16
legacy.go
...ng/src/k8s.io/apiserver/pkg/endpoints/discovery/legacy.go
+8
-10
genericapiserver.go
staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
+1
-6
No files found.
staging/src/k8s.io/apiserver/pkg/endpoints/discovery/legacy.go
View file @
b063e9f8
...
...
@@ -32,23 +32,21 @@ import (
// legacyRootAPIHandler creates a webservice serving api group discovery.
type
legacyRootAPIHandler
struct
{
// addresses is used to build cluster IPs for discovery.
addresses
Addresses
apiPrefix
string
serializer
runtime
.
NegotiatedSerializer
apiVersions
[]
string
addresses
Addresses
apiPrefix
string
serializer
runtime
.
NegotiatedSerializer
}
func
NewLegacyRootAPIHandler
(
addresses
Addresses
,
serializer
runtime
.
NegotiatedSerializer
,
apiPrefix
string
,
apiVersions
[]
string
)
*
legacyRootAPIHandler
{
func
NewLegacyRootAPIHandler
(
addresses
Addresses
,
serializer
runtime
.
NegotiatedSerializer
,
apiPrefix
string
)
*
legacyRootAPIHandler
{
// Because in release 1.1, /apis returns response with empty APIVersion, we
// use stripVersionNegotiatedSerializer to keep the response backwards
// compatible.
serializer
=
stripVersionNegotiatedSerializer
{
serializer
}
return
&
legacyRootAPIHandler
{
addresses
:
addresses
,
apiPrefix
:
apiPrefix
,
serializer
:
serializer
,
apiVersions
:
apiVersions
,
addresses
:
addresses
,
apiPrefix
:
apiPrefix
,
serializer
:
serializer
,
}
}
...
...
@@ -71,7 +69,7 @@ func (s *legacyRootAPIHandler) handle(req *restful.Request, resp *restful.Respon
clientIP
:=
utilnet
.
GetClientIP
(
req
.
Request
)
apiVersions
:=
&
metav1
.
APIVersions
{
ServerAddressByClientCIDRs
:
s
.
addresses
.
ServerAddressByClientCIDRs
(
clientIP
),
Versions
:
s
.
apiVersions
,
Versions
:
[]
string
{
"v1"
}
,
}
responsewriters
.
WriteObjectNegotiated
(
s
.
serializer
,
schema
.
GroupVersion
{},
resp
.
ResponseWriter
,
req
.
Request
,
http
.
StatusOK
,
apiVersions
)
...
...
staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
View file @
b063e9f8
...
...
@@ -341,14 +341,9 @@ func (s *GenericAPIServer) InstallLegacyAPIGroup(apiPrefix string, apiGroupInfo
return
err
}
// setup discovery
apiVersions
:=
[]
string
{}
for
_
,
groupVersion
:=
range
apiGroupInfo
.
PrioritizedVersions
{
apiVersions
=
append
(
apiVersions
,
groupVersion
.
Version
)
}
// Install the version handler.
// Add a handler at /<apiPrefix> to enumerate the supported api versions.
s
.
Handler
.
GoRestfulContainer
.
Add
(
discovery
.
NewLegacyRootAPIHandler
(
s
.
discoveryAddresses
,
s
.
Serializer
,
apiPrefix
,
apiVersions
)
.
WebService
())
s
.
Handler
.
GoRestfulContainer
.
Add
(
discovery
.
NewLegacyRootAPIHandler
(
s
.
discoveryAddresses
,
s
.
Serializer
,
apiPrefix
)
.
WebService
())
return
nil
}
...
...
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