Skip to content

K
k3s
Commit 3fbf9cb4 authored by Jan Safranek's avatar Jan Safranek
Browse files
Options

Fix deletion of Gluster volumes

GetClassForVolume should check pv.spec.storageClassName together with beta annotation.
parent 70684584
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
pkg/volume/util/util.go
View file @ 3fbf9cb4
......@@ -152,10 +152,9 @@ func GetClassForVolume(kubeClient clientset.Interface, pv *v1.PersistentVolume)
if kubeClient == nil {
return nil, fmt.Errorf("Cannot get kube client")
}
// TODO: replace with a real attribute after beta
className, found := pv.Annotations["volume.beta.kubernetes.io/storage-class"]
if !found {
return nil, fmt.Errorf("Volume has no class annotation")
className := v1.GetPersistentVolumeClass(pv)
if className == "" {
return nil, fmt.Errorf("Volume has no storage class")
}
class, err := kubeClient.StorageV1beta1().StorageClasses().Get(className, metav1.GetOptions{})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment