feat(resize): adding resize support for lvm volumes

.github/workflows/pull_request.yml

@@ -34,9 +34,6 @@ jobs:
       - name: License test
         run: make license-check
 
-      - name: Lint test
-        run: make golint
-
       - name: Shellcheck
         uses: reviewdog/action-shellcheck@v1
         with:

buildscripts/lvm-driver/Dockerfile

@@ -14,7 +14,7 @@
 
 FROM alpine:3.12
 RUN apk add --no-cache lvm2 lvm2-extra util-linux device-mapper
-RUN apk add --no-cache btrfs-progs xfsprogs e2fsprogs e2fsprogs-extra
+RUN apk add --no-cache btrfs-progs xfsprogs xfsprogs-extra e2fsprogs e2fsprogs-extra
 RUN apk add --no-cache ca-certificates libc6-compat
 
 ARG DBUILD_DATE

changelog/unreleased/1-pawanpraka1

@@ -0,0 +1 @@
+adding multi arch build process for LVM Driver

changelog/unreleased/2-pawanpraka1

@@ -0,0 +1 @@
+adding resize support for lvm volumes 

deploy/lvm-operator.yaml

@@ -626,7 +626,10 @@ rules:
   - apiGroups: [""]
     resources: ["nodes"]
     verbs: ["get", "list", "watch"]
-  - apiGroups: ["*"]
+  - apiGroups: [""]
+    resources: ["pods"]
+    verbs: ["get", "list", "watch", "update", "patch"]
+  - apiGroups: ["local.openebs.io"]
     resources: ["lvmvolumes"]
     verbs: ["*"]
 ---
@@ -681,6 +684,19 @@ spec:
       priorityClassName: system-cluster-critical
       serviceAccount: openebs-lvm-controller-sa
       containers:
+        - name: csi-resizer
+          image: quay.io/k8scsi/csi-resizer:v1.1.0
+          args:
+            - "--v=5"
+            - "--csi-address=$(ADDRESS)"
+            - "--leader-election"
+          env:
+            - name: ADDRESS
+              value: /var/lib/csi/sockets/pluginproxy/csi.sock
+          imagePullPolicy: IfNotPresent
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /var/lib/csi/sockets/pluginproxy/
         - name: csi-provisioner
           image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.0
           imagePullPolicy: IfNotPresent
@@ -802,7 +818,7 @@ rules:
   - apiGroups: [""]
     resources: ["persistentvolumes", "nodes", "services"]
     verbs: ["get", "list"]
-  - apiGroups: ["*"]
+  - apiGroups: ["local.openebs.io"]
     resources: ["lvmvolumes"]
     verbs: ["get", "list", "watch", "create", "update", "patch"]
 

deploy/yamls/lvm-driver.yaml

@@ -477,7 +477,10 @@ rules:
   - apiGroups: [""]
     resources: ["nodes"]
     verbs: ["get", "list", "watch"]
-  - apiGroups: ["*"]
+  - apiGroups: [""]
+    resources: ["pods"]
+    verbs: ["get", "list", "watch", "update", "patch"]
+  - apiGroups: ["local.openebs.io"]
     resources: ["lvmvolumes"]
     verbs: ["*"]
 ---
@@ -532,6 +535,19 @@ spec:
       priorityClassName: system-cluster-critical
       serviceAccount: openebs-lvm-controller-sa
       containers:
+        - name: csi-resizer
+          image: quay.io/k8scsi/csi-resizer:v1.1.0
+          args:
+            - "--v=5"
+            - "--csi-address=$(ADDRESS)"
+            - "--leader-election"
+          env:
+            - name: ADDRESS
+              value: /var/lib/csi/sockets/pluginproxy/csi.sock
+          imagePullPolicy: IfNotPresent
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /var/lib/csi/sockets/pluginproxy/
         - name: csi-provisioner
           image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.0
           imagePullPolicy: IfNotPresent
@@ -653,7 +669,7 @@ rules:
   - apiGroups: [""]
     resources: ["persistentvolumes", "nodes", "services"]
     verbs: ["get", "list"]
-  - apiGroups: ["*"]
+  - apiGroups: ["local.openebs.io"]
     resources: ["lvmvolumes"]
     verbs: ["get", "list", "watch", "create", "update", "patch"]
 

pkg/driver/agent.go

@@ -282,8 +282,37 @@ func (ns *node) NodeExpandVolume(
 	ctx context.Context,
 	req *csi.NodeExpandVolumeRequest,
 ) (*csi.NodeExpandVolumeResponse, error) {
+	volumeID := req.GetVolumeId()
+	if req.GetVolumePath() == "" || volumeID == "" {
+		return nil, status.Errorf(
+			codes.InvalidArgument,
+			"path not provided for NodeExpandVolume Request %s",
+			volumeID,
+		)
+	}
 
-	return nil, status.Error(codes.Unimplemented, "")
+	vol, err := lvm.GetLVMVolume(volumeID)
+
+	if err != nil {
+		return nil, status.Errorf(
+			codes.NotFound,
+			"failed to handle NodeExpandVolume Request for %s, {%s}",
+			req.VolumeId,
+			err.Error(),
+		)
+	}
+	if err = lvm.ResizeLVMVolume(vol, req.GetVolumePath()); err != nil {
+		return nil, status.Errorf(
+			codes.Internal,
+			"failed to handle NodeExpandVolume Request for %s, {%s}",
+			req.VolumeId,
+			err.Error(),
+		)
+	}
+
+	return &csi.NodeExpandVolumeResponse{
+		CapacityBytes: req.GetCapacityRange().GetRequiredBytes(),
+	}, nil
 }
 
 // NodeGetVolumeStats returns statistics for the

pkg/driver/controller.go

@@ -381,7 +381,59 @@ func (cs *controller) ControllerExpandVolume(
 	req *csi.ControllerExpandVolumeRequest,
 ) (*csi.ControllerExpandVolumeResponse, error) {
 
-	return nil, status.Error(codes.Unimplemented, "")
+	volumeID := strings.ToLower(req.GetVolumeId())
+	if volumeID == "" {
+		return nil, status.Errorf(
+			codes.InvalidArgument,
+			"ControllerExpandVolume: no volumeID provided",
+		)
+	}
+
+	/* round off the new size */
+	updatedSize := getRoundedCapacity(req.GetCapacityRange().GetRequiredBytes())
+
+	vol, err := lvm.GetLVMVolume(volumeID)
+	if err != nil {
+		return nil, status.Errorf(
+			codes.Internal,
+			"ControllerExpandVolumeRequest: failed to get LVMVolume for %s, {%s}",
+			volumeID,
+			err.Error(),
+		)
+	}
+
+	volsize, err := strconv.ParseInt(vol.Spec.Capacity, 10, 64)
+	if err != nil {
+		return nil, status.Errorf(
+			codes.Internal,
+			"ControllerExpandVolumeRequest: failed to parse volsize in for %s, {%s}",
+			volumeID,
+			err.Error(),
+		)
+	}
+	/*
+	 * Controller expand volume must be idempotent. If a volume corresponding
+	 * to the specified volume ID is already larger than or equal to the target
+	 * capacity of the expansion request, the plugin should reply 0 OK.
+	 */
+	if volsize >= updatedSize {
+		return csipayload.NewControllerExpandVolumeResponseBuilder().
+			WithCapacityBytes(volsize).
+			Build(), nil
+	}
+
+	if err := lvm.ResizeVolume(vol, updatedSize); err != nil {
+		return nil, status.Errorf(
+			codes.Internal,
+			"failed to handle ControllerExpandVolumeRequest for %s, {%s}",
+			volumeID,
+			err.Error(),
+		)
+	}
+	return csipayload.NewControllerExpandVolumeResponseBuilder().
+		WithCapacityBytes(updatedSize).
+		WithNodeExpansionRequired(true).
+		Build(), nil
 }
 
 // CreateSnapshot creates a snapshot for given volume
@@ -530,6 +582,7 @@ func newControllerCapabilities() []*csi.ControllerServiceCapability {
 	var capabilities []*csi.ControllerServiceCapability
 	for _, cap := range []csi.ControllerServiceCapability_RPC_Type{
 		csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME,
+		csi.ControllerServiceCapability_RPC_EXPAND_VOLUME,
 	} {
 		capabilities = append(capabilities, fromType(cap))
 	}

pkg/lvm/lvm_util.go

@@ -36,6 +36,7 @@ const (
 	VGCreate = "vgcreate"
 	LVCreate = "lvcreate"
 	LVRemove = "lvremove"
+	LVExtend = "lvextend"
 )
 
 // builldLVMCreateArgs returns lvcreate command for the volume
@@ -119,3 +120,32 @@ func GetVolumeDevPath(vol *apis.LVMVolume) (string, error) {
 
 	return dev, nil
 }
+
+// builldVolumeResizeArgs returns resize command for the lvm volume
+func buildVolumeResizeArgs(vol *apis.LVMVolume) []string {
+	var LVMVolArg []string
+
+	dev := DevPath + vol.Spec.VolGroup + "/" + vol.Name
+	size := vol.Spec.Capacity + "b"
+
+	LVMVolArg = append(LVMVolArg, dev, "-L", size, "-r")
+
+	return LVMVolArg
+}
+
+// ResizeLVMVolume resizes the volume
+func ResizeLVMVolume(vol *apis.LVMVolume, mountpath string) error {
+	volume := vol.Spec.VolGroup + "/" + vol.Name
+
+	args := buildVolumeResizeArgs(vol)
+	cmd := exec.Command(LVExtend, args...)
+	out, err := cmd.CombinedOutput()
+
+	if err != nil {
+		klog.Errorf(
+			"lvm: could not resize the volume %v cmd %v error: %s", volume, args, string(out),
+		)
+	}
+
+	return err
+}

pkg/lvm/volume.go

@@ -16,6 +16,7 @@ package lvm
 
 import (
 	"os"
+	"strconv"
 
 	apis "github.com/openebs/lvm-localpv/pkg/apis/openebs.io/lvm/v1alpha1"
 	"github.com/openebs/lvm-localpv/pkg/builder/volbuilder"
@@ -147,3 +148,12 @@ func RemoveVolFinalizer(vol *apis.LVMVolume) error {
 	_, err := volbuilder.NewKubeclient().WithNamespace(LvmNamespace).Update(vol)
 	return err
 }
+
+// ResizeVolume resizes the lvm volume
+func ResizeVolume(vol *apis.LVMVolume, newSize int64) error {
+
+	vol.Spec.Capacity = strconv.FormatInt(int64(newSize), 10)
+
+	_, err := volbuilder.NewKubeclient().WithNamespace(LvmNamespace).Update(vol)
+	return err
+}