[controller] Update sds-node-configurator api model

Signed-off-by: Viktor Kramarenko <viktor.kramarenko@flant.com>
deckhouse · Jul 17, 2024 · cc76b00 · cc76b00
1 parent c91a1fb
commit cc76b00
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 5 deletions.
diff --git a/images/sds-local-volume-controller/go.mod b/images/sds-local-volume-controller/go.mod
@@ -4,7 +4,7 @@ go 1.22.2
 
 require (
 	github.com/deckhouse/sds-local-volume/api v0.0.0-20240704080736-a027a963cc2c
-	github.com/deckhouse/sds-node-configurator/api v0.0.0-20240705070320-a7a740787b36
+	github.com/deckhouse/sds-node-configurator/api v0.0.0-20240709091744-c9d24f05db41
 	github.com/go-logr/logr v1.4.2
 	github.com/onsi/ginkgo/v2 v2.19.0
 	github.com/onsi/gomega v1.33.1

diff --git a/images/sds-local-volume-controller/go.sum b/images/sds-local-volume-controller/go.sum
@@ -10,6 +10,8 @@ github.com/deckhouse/sds-local-volume/api v0.0.0-20240704080736-a027a963cc2c h1:
 github.com/deckhouse/sds-local-volume/api v0.0.0-20240704080736-a027a963cc2c/go.mod h1:cYxHYJmIl6g9lXb1etqmLeQL/vsPMgscmact/FObd+U=
 github.com/deckhouse/sds-node-configurator/api v0.0.0-20240705070320-a7a740787b36 h1:ToJpGIAHud57Fxm5P1oULRibHpcCuysHqg5dgT0aeys=
 github.com/deckhouse/sds-node-configurator/api v0.0.0-20240705070320-a7a740787b36/go.mod h1:H71+9G0Jr46Qs0BA3z3/xt0h9lbnJnCEYcaCJCWFBf0=
+github.com/deckhouse/sds-node-configurator/api v0.0.0-20240709091744-c9d24f05db41 h1:kfnAfII4E8yWkDZ4FJIPO9/OvXkMIQDPLB3zzNBo8Wg=
+github.com/deckhouse/sds-node-configurator/api v0.0.0-20240709091744-c9d24f05db41/go.mod h1:H71+9G0Jr46Qs0BA3z3/xt0h9lbnJnCEYcaCJCWFBf0=
 github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
 github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=

diff --git a/images/sds-local-volume-csi/driver/controller.go b/images/sds-local-volume-csi/driver/controller.go
@@ -320,7 +320,7 @@ func (d *Driver) ControllerExpandVolume(ctx context.Context, request *csi.Contro
 
 	d.log.Info("start resize LVMLogicalVolume")
 	d.log.Info(fmt.Sprintf("requested size: %s, actual size: %s", requestCapacity.String(), llv.Status.ActualSize.String()))
-	llv.Spec.Size = *requestCapacity
+	llv.Spec.Size = requestCapacity.String()
 	err = utils.UpdateLVMLogicalVolume(ctx, d.cl, llv)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "error updating LVMLogicalVolume: %v", err)

diff --git a/images/sds-local-volume-csi/go.mod b/images/sds-local-volume-csi/go.mod
@@ -5,7 +5,7 @@ go 1.22.2
 require (
 	github.com/container-storage-interface/spec v1.9.0
 	github.com/deckhouse/sds-local-volume/api v0.0.0-20240704080736-a027a963cc2c
-	github.com/deckhouse/sds-node-configurator/api v0.0.0-20240705070320-a7a740787b36
+	github.com/deckhouse/sds-node-configurator/api v0.0.0-20240709091744-c9d24f05db41
 	github.com/go-logr/logr v1.4.1
 	github.com/golang/protobuf v1.5.4
 	golang.org/x/sync v0.6.0

diff --git a/images/sds-local-volume-csi/go.sum b/images/sds-local-volume-csi/go.sum
@@ -7,6 +7,8 @@ github.com/deckhouse/sds-local-volume/api v0.0.0-20240704080736-a027a963cc2c h1:
 github.com/deckhouse/sds-local-volume/api v0.0.0-20240704080736-a027a963cc2c/go.mod h1:cYxHYJmIl6g9lXb1etqmLeQL/vsPMgscmact/FObd+U=
 github.com/deckhouse/sds-node-configurator/api v0.0.0-20240705070320-a7a740787b36 h1:ToJpGIAHud57Fxm5P1oULRibHpcCuysHqg5dgT0aeys=
 github.com/deckhouse/sds-node-configurator/api v0.0.0-20240705070320-a7a740787b36/go.mod h1:H71+9G0Jr46Qs0BA3z3/xt0h9lbnJnCEYcaCJCWFBf0=
+github.com/deckhouse/sds-node-configurator/api v0.0.0-20240709091744-c9d24f05db41 h1:kfnAfII4E8yWkDZ4FJIPO9/OvXkMIQDPLB3zzNBo8Wg=
+github.com/deckhouse/sds-node-configurator/api v0.0.0-20240709091744-c9d24f05db41/go.mod h1:H71+9G0Jr46Qs0BA3z3/xt0h9lbnJnCEYcaCJCWFBf0=
 github.com/emicklei/go-restful/v3 v3.12.0 h1:y2DdzBAURM29NFF94q6RaY4vjIH1rtwDapwQtU84iWk=
 github.com/emicklei/go-restful/v3 v3.12.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=

diff --git a/images/sds-local-volume-csi/pkg/utils/func.go b/images/sds-local-volume-csi/pkg/utils/func.go
@@ -365,7 +365,7 @@ func GetLLVSpec(log *logger.Logger, lvName string, selectedLVG snc.LvmVolumeGrou
 	lvmLogicalVolumeSpec := snc.LVMLogicalVolumeSpec{
 		ActualLVNameOnTheNode: lvName,
 		Type:                  lvmType,
-		Size:                  llvSize,
+		Size:                  llvSize.String(),
 		LvmVolumeGroupName:    selectedLVG.Name,
 	}
 

diff --git a/images/sds-local-volume-scheduler-extender/go.mod b/images/sds-local-volume-scheduler-extender/go.mod
@@ -4,7 +4,7 @@ go 1.22.2
 
 require (
 	github.com/deckhouse/sds-local-volume/api v0.0.0-20240704080736-a027a963cc2c
-	github.com/deckhouse/sds-node-configurator/api v0.0.0-20240705070320-a7a740787b36
+	github.com/deckhouse/sds-node-configurator/api v0.0.0-20240709091744-c9d24f05db41
 	github.com/go-logr/logr v1.4.1
 	github.com/go-logr/zapr v1.3.0
 	github.com/spf13/cobra v1.8.0

diff --git a/images/sds-local-volume-scheduler-extender/go.sum b/images/sds-local-volume-scheduler-extender/go.sum
@@ -11,6 +11,8 @@ github.com/deckhouse/sds-local-volume/api v0.0.0-20240704080736-a027a963cc2c h1:
 github.com/deckhouse/sds-local-volume/api v0.0.0-20240704080736-a027a963cc2c/go.mod h1:cYxHYJmIl6g9lXb1etqmLeQL/vsPMgscmact/FObd+U=
 github.com/deckhouse/sds-node-configurator/api v0.0.0-20240705070320-a7a740787b36 h1:ToJpGIAHud57Fxm5P1oULRibHpcCuysHqg5dgT0aeys=
 github.com/deckhouse/sds-node-configurator/api v0.0.0-20240705070320-a7a740787b36/go.mod h1:H71+9G0Jr46Qs0BA3z3/xt0h9lbnJnCEYcaCJCWFBf0=
+github.com/deckhouse/sds-node-configurator/api v0.0.0-20240709091744-c9d24f05db41 h1:kfnAfII4E8yWkDZ4FJIPO9/OvXkMIQDPLB3zzNBo8Wg=
+github.com/deckhouse/sds-node-configurator/api v0.0.0-20240709091744-c9d24f05db41/go.mod h1:H71+9G0Jr46Qs0BA3z3/xt0h9lbnJnCEYcaCJCWFBf0=
 github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
 github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=