csi support for kubectl os csi

sbueringer · Apr 21, 2019 · 20a5e6d · 20a5e6d
1 parent 28efa0c
commit 20a5e6d
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/pkg/kubernetes/kubernetes.go b/pkg/kubernetes/kubernetes.go
@@ -57,11 +57,16 @@ func GetPersistentVolumes(kubeClient *kubernetes.Clientset) (map[string]v1.Persi
 	}
 	pvMap := map[string]v1.PersistentVolume{}
 	for _, pv := range pvs.Items {
-		if pv.Spec.Cinder == nil {
+		if pv.Spec.Cinder != nil {
 			// TODO log(skipping pv because it is no cinder volume)
+			pvMap[pv.Spec.Cinder.VolumeID] = pv
+			continue
+		}
+		if pv.Spec.CSI != nil {
+			// TODO log(skipping pv because it is no cinder volume)
+			pvMap[pv.Spec.CSI.VolumeHandle] = pv
 			continue
 		}
-		pvMap[pv.Spec.Cinder.VolumeID] = pv
 	}
 	return pvMap, nil
 }