github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix deletion of Gluster volumes

Browse Source 
GetClassForVolume should check pv.spec.storageClassName together
with beta annotation.
This commit is contained in:
Jan Safranek 2017-04-03 15:33:56 +02:00
parent 70684584be
commit 3fbf9cb451
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/volume/util/util.go
View File

@ -152,10 +152,9 @@ func GetClassForVolume(kubeClient clientset.Interface, pv *v1.PersistentVolume)
if kubeClient == nil { if kubeClient == nil {
return nil, fmt.Errorf("Cannot get kube client") return nil, fmt.Errorf("Cannot get kube client")
} }
// TODO: replace with a real attribute after beta className := v1.GetPersistentVolumeClass(pv)
className, found := pv.Annotations["volume.beta.kubernetes.io/storage-class"] if className == "" {
if !found { return nil, fmt.Errorf("Volume has no storage class")
return nil, fmt.Errorf("Volume has no class annotation")
} }
class, err := kubeClient.StorageV1beta1().StorageClasses().Get(className, metav1.GetOptions{}) class, err := kubeClient.StorageV1beta1().StorageClasses().Get(className, metav1.GetOptions{})