Merge pull request #93739 from mrkm4ntr/pv-class-name

Use v1helper.GetPersistentVolumeClass for compatibility
This commit is contained in:
Kubernetes Prow Robot 2020-08-27 16:07:17 -07:00 committed by GitHub
commit 2fbde4f5d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -26,6 +26,7 @@ import (
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/client-go/tools/cache"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
)
// AssumeCache is a cache on top of the informer that allows for updating
@ -357,7 +358,7 @@ type pvAssumeCache struct {
func pvStorageClassIndexFunc(obj interface{}) ([]string, error) {
if pv, ok := obj.(*v1.PersistentVolume); ok {
return []string{pv.Spec.StorageClassName}, nil
return []string{v1helper.GetPersistentVolumeClass(pv)}, nil
}
return []string{""}, fmt.Errorf("object is not a v1.PersistentVolume: %v", obj)
}