Merge pull request #19 from openebs/openebs-provisioner-dev

Add the fixes for non default namespace
openebs-archive · Dec 25, 2017 · d922e54 · d922e54
2 parents bf25c9f + a1b5a6e
commit d922e54
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 5 deletions.
diff --git a/openebs/openebs-provisioner.go b/openebs/openebs-provisioner.go
@@ -39,6 +39,9 @@ import (
 
 const (
 	provisionerName = "openebs.io/provisioner-iscsi"
+	// BetaStorageClassAnnotation represents the beta/previous StorageClass annotation.
+	// It's currently still used and will be held for backwards compatibility
+	BetaStorageClassAnnotation = "volume.beta.kubernetes.io/storage-class"
 )
 
 type openEBSProvisioner struct {
@@ -90,7 +93,13 @@ func (p *openEBSProvisioner) Provision(options controller.VolumeOptions) (*v1.Pe
 	volSize := options.PVC.Spec.Resources.Requests[v1.ResourceName(v1.ResourceStorage)]
 	volumeSpec.Metadata.Labels.Storage = volSize.String()
 
-	volumeSpec.Metadata.Labels.StorageClass = *options.PVC.Spec.StorageClassName
+	className := GetStorageClassName(options)
+
+	if className == nil {
+		glog.Errorf("Volume has no storage class specified")
+	} else {
+		volumeSpec.Metadata.Labels.StorageClass = *className
+	}
 	volumeSpec.Metadata.Labels.Namespace = options.PVC.Namespace
 	volumeSpec.Metadata.Name = options.PVName
 
@@ -100,7 +109,7 @@ func (p *openEBSProvisioner) Provision(options controller.VolumeOptions) (*v1.Pe
 		return nil, err
 	}
 
-	err = openebsVol.ListVolume(options.PVName, &volume)
+	err = openebsVol.ListVolume(options.PVName, options.PVC.Namespace, &volume)
 	if err != nil {
 		glog.Errorf("Error getting volume details: %v", err)
 		return nil, err
@@ -195,7 +204,7 @@ func (p *openEBSProvisioner) Delete(volume *v1.PersistentVolume) error {
 	}
 
 	// Issue a delete request to Maya API Server
-	err := openebsVol.DeleteVolume(volume.Name)
+	err := openebsVol.DeleteVolume(volume.Name, volume.Spec.ClaimRef.Namespace)
 	if err != nil {
 		glog.Errorf("Error while deleting volume: %v", err)
 		return err
@@ -252,3 +261,12 @@ func main() {
 	}
 
 }
+
+// GetPersistentVolumeClass returns StorageClassName.
+func GetStorageClassName(options controller.VolumeOptions) *string {
+	// Use beta annotation first
+	if class, found := options.PVC.Annotations[BetaStorageClassAnnotation]; found {
+		return &class
+	}
+	return options.PVC.Spec.StorageClassName
+}
diff --git a/openebs/pkg/v1/maya_api.go b/openebs/pkg/v1/maya_api.go
@@ -123,7 +123,7 @@ func (v OpenEBSVolume) CreateVolume(vs mayav1.VolumeSpec) (string, error) {
 }
 
 // ListVolume to get the info of Vsm through a API call to m-apiserver
-func (v OpenEBSVolume) ListVolume(vname string, obj interface{}) error {
+func (v OpenEBSVolume) ListVolume(vname string, namespace string, obj interface{}) error {
 
 	addr := os.Getenv("MAPI_ADDR")
 	if addr == "" {
@@ -136,6 +136,12 @@ func (v OpenEBSVolume) ListVolume(vname string, obj interface{}) error {
 	glog.V(2).Infof("[DEBUG] Get details for Volume :%v", string(vname))
 
 	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return err
+	}
+
+	req.Header.Set("namespace", namespace)
+
 	c := &http.Client{
 		Timeout: timeout,
 	}
@@ -156,7 +162,7 @@ func (v OpenEBSVolume) ListVolume(vname string, obj interface{}) error {
 }
 
 // DeleteVolume to get delete Vsm through a API call to m-apiserver
-func (v OpenEBSVolume) DeleteVolume(vname string) error {
+func (v OpenEBSVolume) DeleteVolume(vname string, namespace string) error {
 
 	addr := os.Getenv("MAPI_ADDR")
 	if addr == "" {
@@ -169,6 +175,12 @@ func (v OpenEBSVolume) DeleteVolume(vname string) error {
 	glog.V(2).Infof("[DEBUG] Delete Volume :%v", string(vname))
 
 	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return err
+	}
+
+	req.Header.Set("namespace", namespace)
+
 	c := &http.Client{
 		Timeout: timeout,
 	}