Merge branch 'v1.0.x' of https://github.com/openebs/maya into v1.0.x

mittachaitu · Jun 8, 2019 · ee76a03 · ee76a03
2 parents c76a9ff + f8cf647
commit ee76a03
Show file tree

Hide file tree

Showing 77 changed files with 4,643 additions and 1,522 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -72,7 +72,7 @@ ifeq (${IMAGE_TAG}, )
 endif
 
 ifeq (${TRAVIS_TAG}, )
-  BASE_TAG = ci
+  BASE_TAG = v1.0.x-ci
   export BASE_TAG
 else
   BASE_TAG = ${TRAVIS_TAG}

diff --git a/cmd/provisioner-localpv/app/config.go b/cmd/provisioner-localpv/app/config.go
@@ -190,3 +190,12 @@ func GetStorageClassName(pvc *v1.PersistentVolumeClaim) *string {
 	}
 	return pvc.Spec.StorageClassName
 }
+
+// GetLocalPVType extracts the Local PV Type from PV
+func GetLocalPVType(pv *v1.PersistentVolume) string {
+	casType, found := pv.Labels[string(mconfig.CASTypeKey)]
+	if found {
+		return casType
+	}
+	return ""
+}
diff --git a/cmd/provisioner-localpv/app/helper.go b/cmd/provisioner-localpv/app/helper.go