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

Merge pull request #43982 from jsafrane/fix-gluster-storage-class

Browse Source 
Automatic merge from submit-queue

Fix deletion of Gluster, Ceph and Quobyte volumes

GetClassForVolume should check pv.spec.storageClassName together with beta annotation.

Fixes #43929

@kubernetes/sig-storage-pr-reviews 

```release-note
Fix bug with error "Volume has no class annotation" when deleting a PersistentVolume.
```
This commit is contained in:
Kubernetes Submit Queue 2017-04-03 08:35:32 -07:00 committed by GitHub
commit a2b4fb9b33
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 {
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{})