github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Fix receiver names in legacyProvider

Browse Source
This commit is contained in:
Junhao Zou 2023-08-10 14:59:46 +08:00
parent 3d941afece
commit 509ffe2938
No known key found for this signature in database
GPG Key ID: B518B86B5889A637
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/registry/core/rest/storage_core.go
View File

@ -147,13 +147,13 @@ func New(c Config) (*legacyProvider, error) {
return p, nil return p, nil
} }
func (c *legacyProvider) NewRESTStorage(apiResourceConfigSource serverstorage.APIResourceConfigSource, restOptionsGetter generic.RESTOptionsGetter) (genericapiserver.APIGroupInfo, error) { func (p *legacyProvider) NewRESTStorage(apiResourceConfigSource serverstorage.APIResourceConfigSource, restOptionsGetter generic.RESTOptionsGetter) (genericapiserver.APIGroupInfo, error) {
apiGroupInfo, err := c.GenericConfig.NewRESTStorage(apiResourceConfigSource, restOptionsGetter) apiGroupInfo, err := p.GenericConfig.NewRESTStorage(apiResourceConfigSource, restOptionsGetter)
if err != nil { if err != nil {
return genericapiserver.APIGroupInfo{}, err return genericapiserver.APIGroupInfo{}, err
} }
podDisruptionClient, err := policyclient.NewForConfig(c.LoopbackClientConfig) podDisruptionClient, err := policyclient.NewForConfig(p.LoopbackClientConfig)
if err != nil { if err != nil {
return genericapiserver.APIGroupInfo{}, err return genericapiserver.APIGroupInfo{}, err
} }
@ -182,7 +182,7 @@ func (c *legacyProvider) NewRESTStorage(apiResourceConfigSource serverstorage.AP
return genericapiserver.APIGroupInfo{}, err return genericapiserver.APIGroupInfo{}, err
} }
nodeStorage, err := nodestore.NewStorage(restOptionsGetter, c.Proxy.KubeletClientConfig, c.Proxy.Transport) nodeStorage, err := nodestore.NewStorage(restOptionsGetter, p.Proxy.KubeletClientConfig, p.Proxy.Transport)
if err != nil { if err != nil {
return genericapiserver.APIGroupInfo{}, err return genericapiserver.APIGroupInfo{}, err
} }
@ -190,7 +190,7 @@ func (c *legacyProvider) NewRESTStorage(apiResourceConfigSource serverstorage.AP
podStorage, err := podstore.NewStorage( podStorage, err := podstore.NewStorage(
restOptionsGetter, restOptionsGetter,
nodeStorage.KubeletConnectionInfo, nodeStorage.KubeletConnectionInfo,
c.Proxy.Transport, p.Proxy.Transport,
podDisruptionClient, podDisruptionClient,
) )
if err != nil { if err != nil {
@ -199,12 +199,12 @@ func (c *legacyProvider) NewRESTStorage(apiResourceConfigSource serverstorage.AP
serviceRESTStorage, serviceStatusStorage, serviceRESTProxy, err := servicestore.NewREST( serviceRESTStorage, serviceStatusStorage, serviceRESTProxy, err := servicestore.NewREST(
restOptionsGetter, restOptionsGetter,
c.primaryServiceClusterIPAllocator.IPFamily(), p.primaryServiceClusterIPAllocator.IPFamily(),
c.serviceClusterIPAllocators, p.serviceClusterIPAllocators,
c.serviceNodePortAllocator, p.serviceNodePortAllocator,
endpointsStorage, endpointsStorage,
podStorage.Pod, podStorage.Pod,
c.Proxy.Transport) p.Proxy.Transport)
if err != nil { if err != nil {
return genericapiserver.APIGroupInfo{}, err return genericapiserver.APIGroupInfo{}, err
} }
@ -216,8 +216,8 @@ func (c *legacyProvider) NewRESTStorage(apiResourceConfigSource serverstorage.AP
// potentially override the generic serviceaccount storage with one that supports pods // potentially override the generic serviceaccount storage with one that supports pods
var serviceAccountStorage *serviceaccountstore.REST var serviceAccountStorage *serviceaccountstore.REST
if c.ServiceAccountIssuer != nil { if p.ServiceAccountIssuer != nil {
serviceAccountStorage, err = serviceaccountstore.NewREST(restOptionsGetter, c.ServiceAccountIssuer, c.APIAudiences, c.ServiceAccountMaxExpiration, podStorage.Pod.Store, storage["secrets"].(rest.Getter), c.ExtendExpiration) serviceAccountStorage, err = serviceaccountstore.NewREST(restOptionsGetter, p.ServiceAccountIssuer, p.APIAudiences, p.ServiceAccountMaxExpiration, podStorage.Pod.Store, storage["secrets"].(rest.Getter), p.ExtendExpiration)
if err != nil { if err != nil {
return genericapiserver.APIGroupInfo{}, err return genericapiserver.APIGroupInfo{}, err
} }
@ -303,7 +303,7 @@ func (c *legacyProvider) NewRESTStorage(apiResourceConfigSource serverstorage.AP
} }
if resource := "componentstatuses"; apiResourceConfigSource.ResourceEnabled(corev1.SchemeGroupVersion.WithResource(resource)) { if resource := "componentstatuses"; apiResourceConfigSource.ResourceEnabled(corev1.SchemeGroupVersion.WithResource(resource)) {
storage[resource] = componentstatus.NewStorage(componentStatusStorage{c.StorageFactory}.serversToValidate) storage[resource] = componentstatus.NewStorage(componentStatusStorage{p.StorageFactory}.serversToValidate)
} }
if len(storage) > 0 { if len(storage) > 0 {