Merge pull request #64202 from sttts/sttts-crds-removeDeadStorage-logging

Automatic merge from submit-queue (batch tested with PRs 64127, 63895, 64066, 64215, 64202). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. apiextensions: reduce verbose logs in removeDeadStorage We don't need one log line per version. Fixes https://github.com/kubernetes/kubernetes/pull/63830/files#r189808872, part of #64136.

Merge pull request #64202 from sttts/sttts-crds-removeDeadStorage-logging
21836a64 · Kubernetes Submit Queue · GitHub · aa3719d1 · e341803d · 21836a64
Unverified Commit 21836a64 authored May 24, 2018 by Kubernetes Submit Queue Committed by GitHub May 24, 2018
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

customresource_handler.go ...ensions-apiserver/pkg/apiserver/customresource_handler.go +2 -2

No files found.
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go
@@ -349,8 +349,8 @@ func (r *crdHandler) removeDeadStorage() {
 			}
 		}
 		if !found {
-			for version, storage := range s.storages {
+			glog.V(4).Infof("Removing dead CRD storage for %s/%s", s.spec.Group, s.spec.Names.Kind)
-				glog.V(4).Infof("Removing dead CRD storage for %v", s.requestScopes[version].Resource)
+			for _, storage := range s.storages {
 				// destroy only the main storage. Those for the subresources share cacher and etcd clients.
 				storage.CustomResource.DestroyFunc()
 			}