kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

legacy api endpoints only support v1 ever 

Kubernetes-commit: b063e9f85ee28233241ae4f9071a62ac6c9b499c
This commit is contained in:
David Eads 2018-06-22 08:58:32 -04:00 committed by Kubernetes Publisher
parent 175e5a31bd
commit a8cd668cfc
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/endpoints/discovery/legacy.go
View File

@ -32,23 +32,21 @@ import (
// legacyRootAPIHandler creates a webservice serving api group discovery. // legacyRootAPIHandler creates a webservice serving api group discovery.
type legacyRootAPIHandler struct { type legacyRootAPIHandler struct {
// addresses is used to build cluster IPs for discovery. // addresses is used to build cluster IPs for discovery.
addresses Addresses addresses Addresses
apiPrefix string apiPrefix string
serializer runtime.NegotiatedSerializer serializer runtime.NegotiatedSerializer
apiVersions []string
} }
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 // Because in release 1.1, /apis returns response with empty APIVersion, we
// use stripVersionNegotiatedSerializer to keep the response backwards // use stripVersionNegotiatedSerializer to keep the response backwards
// compatible. // compatible.
serializer = stripVersionNegotiatedSerializer{serializer} serializer = stripVersionNegotiatedSerializer{serializer}
return &legacyRootAPIHandler{ return &legacyRootAPIHandler{
addresses: addresses, addresses: addresses,
apiPrefix: apiPrefix, apiPrefix: apiPrefix,
serializer: serializer, serializer: serializer,
apiVersions: apiVersions,
} }
} }
@ -71,7 +69,7 @@ func (s *legacyRootAPIHandler) handle(req *restful.Request, resp *restful.Respon
clientIP := utilnet.GetClientIP(req.Request) clientIP := utilnet.GetClientIP(req.Request)
apiVersions := &metav1.APIVersions{ apiVersions := &metav1.APIVersions{
ServerAddressByClientCIDRs: s.addresses.ServerAddressByClientCIDRs(clientIP), ServerAddressByClientCIDRs: s.addresses.ServerAddressByClientCIDRs(clientIP),
Versions: s.apiVersions, Versions: []string{"v1"},
} }
responsewriters.WriteObjectNegotiated(s.serializer, schema.GroupVersion{}, resp.ResponseWriter, req.Request, http.StatusOK, apiVersions) responsewriters.WriteObjectNegotiated(s.serializer, schema.GroupVersion{}, resp.ResponseWriter, req.Request, http.StatusOK, apiVersions)

7
pkg/server/genericapiserver.go
View File

@ -341,14 +341,9 @@ func (s *GenericAPIServer) InstallLegacyAPIGroup(apiPrefix string, apiGroupInfo
return err return err
} }
// setup discovery
apiVersions := []string{}
for _, groupVersion := range apiGroupInfo.PrioritizedVersions {
apiVersions = append(apiVersions, groupVersion.Version)
}
// Install the version handler. // Install the version handler.
// Add a handler at /<apiPrefix> to enumerate the supported api versions. // 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 return nil
} }