scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42267 from liggitt/discovery-caching

Browse Source 
Automatic merge from submit-queue

Prevent caching empty discovery docs

If kubectl makes requests before a server fully initialized, it could cache bad discovery responses (results of a partially forbidden discovery call, etc)

This changes to only cache responses that included at least one group or resource so that total failure doesn't get cached for 5 minutes
This commit is contained in:
Kubernetes Submit Queue
2017-03-01 06:11:02 -08:00
committed by GitHub
parent ed479163fa 091aac7e1e
commit e99ab5ada4
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubectl/cmd/util/cached_discovery.go
View File

@@ -75,6 +75,11 @@ func (d *CachedDiscoveryClient) ServerResourcesForGroupVersion(groupVersion stri
liveResources, err := d.delegate.ServerResourcesForGroupVersion(groupVersion) liveResources, err := d.delegate.ServerResourcesForGroupVersion(groupVersion)
if err != nil { if err != nil {
glog.V(3).Infof("skipped caching discovery info due to %v", err)
return liveResources, err
}
if liveResources == nil || len(liveResources.APIResources) == 0 {
glog.V(3).Infof("skipped caching discovery info, no resources found")
return liveResources, err return liveResources, err
} }
@@ -117,6 +122,11 @@ func (d *CachedDiscoveryClient) ServerGroups() (*metav1.APIGroupList, error) {
liveGroups, err := d.delegate.ServerGroups() liveGroups, err := d.delegate.ServerGroups()
if err != nil { if err != nil {
glog.V(3).Infof("skipped caching discovery info due to %v", err)
return liveGroups, err
}
if liveGroups == nil || len(liveGroups.Groups) == 0 {
glog.V(3).Infof("skipped caching discovery info, no groups found")
return liveGroups, err return liveGroups, err
} }

2
pkg/kubectl/cmd/util/cached_discovery_test.go
View File

@@ -135,7 +135,7 @@ func (c *fakeDiscoveryClient) ServerGroups() (*metav1.APIGroupList, error) {
func (c *fakeDiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) { func (c *fakeDiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) {
c.resourceCalls = c.resourceCalls + 1 c.resourceCalls = c.resourceCalls + 1
if groupVersion == "a/v1" { if groupVersion == "a/v1" {
return &metav1.APIResourceList{}, nil return &metav1.APIResourceList{APIResources: []metav1.APIResource{{Name: "widgets", Kind: "Widget"}}}, nil
} }
return nil, errors.NewNotFound(schema.GroupResource{}, "") return nil, errors.NewNotFound(schema.GroupResource{}, "")