Merge pull request kubernetes#95629 from roycaihw/fix/storageversion-manager

k8s-ci-robot · web-flow · commit 6f1288f58c2a · 2020-10-19T16:00:07.000-07:00
storageversion manager: fix slice allocation
diff --git a/staging/src/k8s.io/apiserver/pkg/storageversion/manager.go b/staging/src/k8s.io/apiserver/pkg/storageversion/manager.go
@@ -112,7 +112,7 @@ func (s *defaultManager) UpdateStorageVersions(kubeAPIServerClientConfig *rest.C
 	sc := clientset.InternalV1alpha1().StorageVersions()
 
 	s.mu.RLock()
-	resources := make([]*ResourceInfo, len(s.managedResourceInfos))
+	resources := []*ResourceInfo{}
 	for resource := range s.managedResourceInfos {
 		resources = append(resources, resource)
 	}

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ func (s defaultManager) UpdateStorageVersions(kubeAPIServerClientConfig rest.C`
`112`	`112`	`sc := clientset.InternalV1alpha1().StorageVersions()`
`113`	`113`
`114`	`114`	`s.mu.RLock()`
`115`		`- resources := make([]*ResourceInfo, len(s.managedResourceInfos))`
	`115`	`+ resources := []*ResourceInfo{}`
`116`	`116`	`for resource := range s.managedResourceInfos {`
`117`	`117`	`resources = append(resources, resource)`
`118`	`118`	`}`