Merge branch 'develop' into podAntiAffinity

Author: SupeReuven

deploy/helm/charts/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
 name: lvm-localpv
 description: CSI Driver for dynamic provisioning of LVM Persistent Local Volumes.
-version: 1.8.0-develop
-appVersion: 1.8.0-develop
+version: 1.9.0-develop
+appVersion: 1.9.0-develop
 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/openebs/icon/color/openebs-icon-color.png
 home: https://openebs.io/
 keywords:
@@ -16,5 +16,5 @@ sources:
 - https://github.com/openebs/lvm-localpv
 dependencies:
   - name: crds
-    version: 1.8.0-develop
+    version: 1.9.0-develop
     condition: crds.enabled

deploy/helm/charts/charts/crds/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v2
 name: crds
-version: 1.8.0-develop
+version: 1.9.0-develop
 description: A Helm chart that collects CustomResourceDefinitions (CRDs) from lvm-localpv.

deploy/helm/charts/values.yaml

@@ -38,12 +38,12 @@ lvmNode:
   # microk8s where kubelet dir is different
   kubeletDir: "/var/lib/kubelet/"
   resources: {}
-#    limits:
-#      cpu: 10m
-#      memory: 32Mi
-#    requests:
-#      cpu: 10m
-#      memory: 32Mi
+  #    limits:
+  #      cpu: 10m
+  #      memory: 32Mi
+  #    requests:
+  #      cpu: 10m
+  #      memory: 32Mi
   ## Labels to be added to openebs-lvm node pods
   podLabels:
     app: openebs-lvm-node
@@ -121,12 +121,12 @@ lvmController:
   annotations: {}
   podAnnotations: {}
   resources: {}
-#    limits:
-#      cpu: 10m
-#      memory: 32Mi
-#    requests:
-#      cpu: 10m
-#      memory: 32Mi
+  #    limits:
+  #      cpu: 10m
+  #      memory: 32Mi
+  #    requests:
+  #      cpu: 10m
+  #      memory: 32Mi
   ## Labels to be added to openebs-lvm controller pods
   podLabels:
     name: openebs-lvm-controller
@@ -154,11 +154,11 @@ lvmPlugin:
   image:
     # Make sure that registry name end with a '/'.
     # For example : registry.k8s.io/ is a correct value here and quay.io is incorrect
-    registry:
+    registry: docker.io/
     repository: openebs/lvm-driver
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: 1.8.0-develop
+    tag: 1.9.0-develop
   ioLimits:
     enabled: false
     containerRuntime: containerd

pkg/driver/controller.go

@@ -365,7 +365,6 @@ func CreateLVMVolume(ctx context.Context, req *csi.CreateVolumeRequest,
 	}
 	klog.Infof("scheduling the volume %s/%s on node %s",
 		params.VgPattern.String(), volName, owner)
-		
 	volObj, err := volbuilder.NewBuilder().
 		WithName(volName).
 		WithCapacity(capacity).
@@ -664,14 +663,19 @@ func (cs *controller) CreateSnapshot(
 	}
 
 	snapTimeStamp := time.Now().Unix()
-	state, err := lvm.GetLVMSnapshotStatus(req.Name)
-
+	var lvmSnap *lvmapi.LVMSnapshot
+	var restoreSize int64
+	lvmSnap, err = waitForLVMSnapshotReady(req.Name)
 	if err == nil {
+		if lvmSnap.Spec.ThinProvision {
+			restoreSize = lvmSnap.Status.LvSize.Value()
+		}
 		return csipayload.NewCreateSnapshotResponseBuilder().
 			WithSourceVolumeID(req.SourceVolumeId).
 			WithSnapshotID(req.SourceVolumeId+"@"+req.Name).
 			WithCreationTime(snapTimeStamp, 0).
-			WithReadyToUse(state == lvm.LVMStatusReady).
+			WithReadyToUse(lvmSnap.Status.State == lvm.LVMStatusReady).
+			WithSize(restoreSize).
 			Build(), nil
 	}
 
@@ -751,16 +755,47 @@ func (cs *controller) CreateSnapshot(
 		)
 	}
 
-	state, _ = lvm.GetLVMSnapshotStatus(req.Name)
+	lvmSnap, err = waitForLVMSnapshotReady(req.Name)
+	if err != nil {
+		return nil, status.Errorf(
+			codes.ResourceExhausted,
+			"failed to handle CreateSnapshotRequest for %s: %s, {%s}",
+			req.SourceVolumeId, req.Name,
+			err.Error(),
+		)
+	}
+	if lvmSnap.Spec.ThinProvision {
+		restoreSize = lvmSnap.Status.LvSize.Value()
+	}
 
 	return csipayload.NewCreateSnapshotResponseBuilder().
 		WithSourceVolumeID(req.SourceVolumeId).
 		WithSnapshotID(req.SourceVolumeId+"@"+req.Name).
 		WithCreationTime(snapTimeStamp, 0).
-		WithReadyToUse(state == lvm.LVMStatusReady).
+		WithReadyToUse(lvmSnap.Status.State == lvm.LVMStatusReady).
+		WithSize(restoreSize).
 		Build(), nil
 }
 
+// waitForLVMSnapshotReady waits for lvm snapshot to be ready and returns
+// the lvm snapshot CR object
+func waitForLVMSnapshotReady(snapName string) (*lvmapi.LVMSnapshot, error) {
+	var err error
+	var snap *lvmapi.LVMSnapshot
+	for i := 0; i < 20; i++ {
+		snap, err = lvm.GetLVMSnapshot(snapName)
+		if k8serror.IsNotFound(err) {
+			return snap, err
+		} else if err == nil {
+			if snap.Status.State == lvm.LVMStatusReady {
+				break
+			}
+		}
+		time.Sleep(time.Duration(100 * time.Millisecond))
+	}
+	return snap, err
+}
+
 func getSnapSize(params *SnapshotParams, capacity int64) int64 {
 	var snapSize int64
 	if !params.AbsSnapSize {

scripts/test-update-chart-version.sh

@@ -67,15 +67,15 @@ run_test "Test 9: On tag creation, version to be reflected on release/x.y branch
          --tag "v1.2.0" --dry-run --chart-version "1.2.0-prerelease"
 
 run_test "Test 10: On tag creation, version to be reflected on release/x.y branch, tag is in future" \
-         "For release/x.y branch the current chart version(1.2.0-prerelease)'s X.Y must exactly match X.Y from tag (1.5.0)" \
+         "ERROR: For release/x.y branch the current chart version(1.2.0-prerelease)'s X.Y must exactly match X.Y from tag (1.5.0)" \
          --tag "v1.5.0" --dry-run --chart-version "1.2.0-prerelease"
 
 run_test "Test 11: On tag creation, version to be reflected on release/x.y branch, tag is in past" \
-         "For release/x.y branch the current chart version(1.2.0-prerelease)'s X.Y must exactly match X.Y from tag (1.0.0)" \
+         "ERROR: For release/x.y branch the current chart version(1.2.0-prerelease)'s X.Y must exactly match X.Y from tag (1.0.0)" \
          --tag "v1.0.0" --dry-run --chart-version "1.2.0-prerelease"
 
 run_test "Test 12: On tag creation, version to be reflected on release/x.y branch, the current chart version is not prerelease" \
-         "Chart version(1.2.0-develop) should be a prerelease format to proceed for tag creation flow" \
+         "ERROR: Chart version(1.2.0-develop) should be a prerelease format to proceed for tag creation flow" \
          --tag "v1.0.0" --dry-run --chart-version "1.2.0-develop"
 
 run_test "Test 13: rc tag, with chart type prerelease" \

scripts/yq_utils.sh

@@ -2,13 +2,12 @@
 # this function gets around that using diff with --ignore-blank-lines
 yq_ibl()
 {
-  set +e
-  diff_out=$(diff -B <(yq '.' "$2") <(yq "$1" "$2")) || error=$?
+  error=0
+  diff_out=$(diff -B <(cat "$2") <(yq "$1" "$2")) || error=$?
   if [ "$error" != "0" ] && [ "$error" != "1" ]; then
     exit "$error"
   fi
   if [ -n "$diff_out" ]; then
     echo "$diff_out" | patch --quiet --no-backup-if-mismatch "$2" -
   fi
-  set -euo pipefail
 }