github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/controller/volume/scheduling/scheduler_assume_cache.go
View File

@ -26,6 +26,7 @@ import (
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"
"k8s.io/client-go/tools/cache" "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 // 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) { func pvStorageClassIndexFunc(obj interface{}) ([]string, error) {
if pv, ok := obj.(*v1.PersistentVolume); ok { 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) return []string{""}, fmt.Errorf("object is not a v1.PersistentVolume: %v", obj)
} }