Skip to content

K
k3s
Commit 7d31bf46 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #39409 from NickrenREN/apiserver-drop-err

Automatic merge from submit-queue (batch tested with PRs 39409, 39400) remove newAPIGroupVersion() and getAPIGroupVersion() second return value
parents 2cc9650e a3def910
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 9 deletions
pkg/genericapiserver/genericapiserver.go
View file @ 7d31bf46
...@@ -211,10 +211,7 @@ func (s preparedGenericAPIServer) Run(stopCh <-chan struct{}) { ...@@ -211,10 +211,7 @@ func (s preparedGenericAPIServer) Run(stopCh <-chan struct{}) {
// installAPIResources is a private method for installing the REST storage backing each api groupversionresource // installAPIResources is a private method for installing the REST storage backing each api groupversionresource
func (s *GenericAPIServer) installAPIResources(apiPrefix string, apiGroupInfo *APIGroupInfo) error { func (s *GenericAPIServer) installAPIResources(apiPrefix string, apiGroupInfo *APIGroupInfo) error {
for _, groupVersion := range apiGroupInfo.GroupMeta.GroupVersions { for _, groupVersion := range apiGroupInfo.GroupMeta.GroupVersions {
apiGroupVersion, err := s.getAPIGroupVersion(apiGroupInfo, groupVersion, apiPrefix) apiGroupVersion := s.getAPIGroupVersion(apiGroupInfo, groupVersion, apiPrefix)
if err != nil {
return err
}
if apiGroupInfo.OptionsExternalVersion != nil { if apiGroupInfo.OptionsExternalVersion != nil {
apiGroupVersion.OptionsExternalVersion = apiGroupInfo.OptionsExternalVersion apiGroupVersion.OptionsExternalVersion = apiGroupInfo.OptionsExternalVersion
} }
...@@ -313,18 +310,18 @@ func (s *GenericAPIServer) RemoveAPIGroupForDiscovery(groupName string) { ...@@ -313,18 +310,18 @@ func (s *GenericAPIServer) RemoveAPIGroupForDiscovery(groupName string) {
delete(s.apiGroupsForDiscovery, groupName) delete(s.apiGroupsForDiscovery, groupName)
} }
func (s *GenericAPIServer) getAPIGroupVersion(apiGroupInfo *APIGroupInfo, groupVersion schema.GroupVersion, apiPrefix string) (*genericapi.APIGroupVersion, error) { func (s *GenericAPIServer) getAPIGroupVersion(apiGroupInfo *APIGroupInfo, groupVersion schema.GroupVersion, apiPrefix string) *genericapi.APIGroupVersion {
storage := make(map[string]rest.Storage) storage := make(map[string]rest.Storage)
for k, v := range apiGroupInfo.VersionedResourcesStorageMap[groupVersion.Version] { for k, v := range apiGroupInfo.VersionedResourcesStorageMap[groupVersion.Version] {
storage[strings.ToLower(k)] = v storage[strings.ToLower(k)] = v
} }
version, err := s.newAPIGroupVersion(apiGroupInfo, groupVersion) version := s.newAPIGroupVersion(apiGroupInfo, groupVersion)
version.Root = apiPrefix version.Root = apiPrefix
version.Storage = storage version.Storage = storage
return version, err return version
} }
func (s *GenericAPIServer) newAPIGroupVersion(apiGroupInfo *APIGroupInfo, groupVersion schema.GroupVersion) (*genericapi.APIGroupVersion, error) { func (s *GenericAPIServer) newAPIGroupVersion(apiGroupInfo *APIGroupInfo, groupVersion schema.GroupVersion) *genericapi.APIGroupVersion {
return &genericapi.APIGroupVersion{ return &genericapi.APIGroupVersion{
GroupVersion: groupVersion, GroupVersion: groupVersion,
...@@ -341,7 +338,7 @@ func (s *GenericAPIServer) newAPIGroupVersion(apiGroupInfo *APIGroupInfo, groupV ...@@ -341,7 +338,7 @@ func (s *GenericAPIServer) newAPIGroupVersion(apiGroupInfo *APIGroupInfo, groupV
Admit: s.admissionControl, Admit: s.admissionControl,
Context: s.RequestContextMapper(), Context: s.RequestContextMapper(),
MinRequestTimeout: s.minRequestTimeout, MinRequestTimeout: s.minRequestTimeout,
}, nil }
} }
// DynamicApisDiscovery returns a webservice serving api group discovery. // DynamicApisDiscovery returns a webservice serving api group discovery.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment