From 8d9ba186b6465cba421ffb716735175535a54ccf Mon Sep 17 00:00:00 2001 From: "v.oleynikov" Date: Wed, 19 Feb 2025 19:33:43 +0300 Subject: [PATCH] Signed-off-by: v.oleynikov --- images/sds-local-volume-controller/src/go.mod | 2 +- images/sds-local-volume-controller/src/go.sum | 4 ++-- images/sds-local-volume-csi/src/go.mod | 2 +- images/sds-local-volume-csi/src/go.sum | 4 ++-- images/sds-local-volume-csi/src/pkg/utils/func.go | 2 +- images/sds-local-volume-scheduler-extender/src/go.mod | 2 +- images/sds-local-volume-scheduler-extender/src/go.sum | 4 ++-- images/webhooks/src/go.mod | 2 +- images/webhooks/src/go.sum | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/images/sds-local-volume-controller/src/go.mod b/images/sds-local-volume-controller/src/go.mod index c2b759b7..50e62d25 100644 --- a/images/sds-local-volume-controller/src/go.mod +++ b/images/sds-local-volume-controller/src/go.mod @@ -4,7 +4,7 @@ go 1.23.4 require ( github.com/deckhouse/sds-local-volume/api v0.0.0-20250114155747-5d75d401a787 - github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219102552-5624447b1e6c // THIS MUST BE CHANGED TO ACTUAL MAIN BEFORE MERGE + github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219163020-f6aebf2f4029 // THIS MUST BE CHANGED TO ACTUAL MAIN BEFORE MERGE github.com/go-logr/logr v1.4.2 github.com/onsi/ginkgo/v2 v2.20.0 github.com/onsi/gomega v1.34.1 diff --git a/images/sds-local-volume-controller/src/go.sum b/images/sds-local-volume-controller/src/go.sum index 0ad9e3e0..229636ca 100644 --- a/images/sds-local-volume-controller/src/go.sum +++ b/images/sds-local-volume-controller/src/go.sum @@ -6,8 +6,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219102552-5624447b1e6c h1:u1NL77HKI3NegdB0QGAhFVFGDd4yMTD51p0LSYPXS5E= -github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219102552-5624447b1e6c/go.mod h1:bhgBeuAdLlDc9EQ5qI+/18iRj8Jfr2qfFwE1QnIoQM4= +github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219163020-f6aebf2f4029 h1:FPh831q6j1lpRKRPobRLAxVpnTtTyWOnTZjvP2NwUKQ= +github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219163020-f6aebf2f4029/go.mod h1:bhgBeuAdLlDc9EQ5qI+/18iRj8Jfr2qfFwE1QnIoQM4= github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU= github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= diff --git a/images/sds-local-volume-csi/src/go.mod b/images/sds-local-volume-csi/src/go.mod index fa7988b0..2f8e775b 100644 --- a/images/sds-local-volume-csi/src/go.mod +++ b/images/sds-local-volume-csi/src/go.mod @@ -6,7 +6,7 @@ require ( github.com/container-storage-interface/spec v1.10.0 github.com/deckhouse/sds-local-volume/api v0.0.0-20250114155747-5d75d401a787 github.com/deckhouse/sds-local-volume/lib/go/common v0.0.0-20250215220933-9c8f9f5ab53d - github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219102552-5624447b1e6c // THIS MUST BE CHANGED TO ACTUAL MAIN BEFORE MERGE + github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219163020-f6aebf2f4029 // THIS MUST BE CHANGED TO ACTUAL MAIN BEFORE MERGE github.com/go-logr/logr v1.4.2 github.com/golang/protobuf v1.5.4 github.com/google/uuid v1.6.0 diff --git a/images/sds-local-volume-csi/src/go.sum b/images/sds-local-volume-csi/src/go.sum index bee2c1d6..76315ff2 100644 --- a/images/sds-local-volume-csi/src/go.sum +++ b/images/sds-local-volume-csi/src/go.sum @@ -6,8 +6,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219102552-5624447b1e6c h1:u1NL77HKI3NegdB0QGAhFVFGDd4yMTD51p0LSYPXS5E= -github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219102552-5624447b1e6c/go.mod h1:bhgBeuAdLlDc9EQ5qI+/18iRj8Jfr2qfFwE1QnIoQM4= +github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219163020-f6aebf2f4029 h1:FPh831q6j1lpRKRPobRLAxVpnTtTyWOnTZjvP2NwUKQ= +github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219163020-f6aebf2f4029/go.mod h1:bhgBeuAdLlDc9EQ5qI+/18iRj8Jfr2qfFwE1QnIoQM4= github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU= github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= diff --git a/images/sds-local-volume-csi/src/pkg/utils/func.go b/images/sds-local-volume-csi/src/pkg/utils/func.go index 7f21340b..bf91922e 100644 --- a/images/sds-local-volume-csi/src/pkg/utils/func.go +++ b/images/sds-local-volume-csi/src/pkg/utils/func.go @@ -273,7 +273,7 @@ func DeleteLVMLogicalVolume(ctx context.Context, kc client.Client, log *logger.L llvThickSpec.Contiguous = llv.Spec.Thick.Contiguous } if volumeCleanup != "disable" { - llvThickSpec.VolumeCleanup = volumeCleanup + llvThickSpec.VolumeCleanup = &volumeCleanup } llv.Spec.Thick = llvThickSpec kc.Update(ctx, llv) diff --git a/images/sds-local-volume-scheduler-extender/src/go.mod b/images/sds-local-volume-scheduler-extender/src/go.mod index 6418196f..0cdf3ef2 100644 --- a/images/sds-local-volume-scheduler-extender/src/go.mod +++ b/images/sds-local-volume-scheduler-extender/src/go.mod @@ -4,7 +4,7 @@ go 1.23.4 require ( github.com/deckhouse/sds-local-volume/api v0.0.0-20250114155747-5d75d401a787 - github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219102552-5624447b1e6c // THIS MUST BE CHANGED TO ACTUAL MAIN BEFORE MERGE + github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219163020-f6aebf2f4029 // THIS MUST BE CHANGED TO ACTUAL MAIN BEFORE MERGE github.com/go-logr/logr v1.4.2 github.com/go-logr/zapr v1.3.0 github.com/spf13/cobra v1.8.1 diff --git a/images/sds-local-volume-scheduler-extender/src/go.sum b/images/sds-local-volume-scheduler-extender/src/go.sum index d1b14c96..7c2a7dfc 100644 --- a/images/sds-local-volume-scheduler-extender/src/go.sum +++ b/images/sds-local-volume-scheduler-extender/src/go.sum @@ -7,8 +7,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219102552-5624447b1e6c h1:u1NL77HKI3NegdB0QGAhFVFGDd4yMTD51p0LSYPXS5E= -github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219102552-5624447b1e6c/go.mod h1:bhgBeuAdLlDc9EQ5qI+/18iRj8Jfr2qfFwE1QnIoQM4= +github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219163020-f6aebf2f4029 h1:FPh831q6j1lpRKRPobRLAxVpnTtTyWOnTZjvP2NwUKQ= +github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219163020-f6aebf2f4029/go.mod h1:bhgBeuAdLlDc9EQ5qI+/18iRj8Jfr2qfFwE1QnIoQM4= github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU= github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/evanphx/json-patch v0.5.2 h1:xVCHIVMUu1wtM/VkR9jVZ45N3FhZfYMMYGorLCR8P3k= diff --git a/images/webhooks/src/go.mod b/images/webhooks/src/go.mod index 44529cc9..d6c0a931 100644 --- a/images/webhooks/src/go.mod +++ b/images/webhooks/src/go.mod @@ -4,7 +4,7 @@ go 1.23.4 require ( github.com/deckhouse/sds-local-volume/api v0.0.0-20250114155747-5d75d401a787 - github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219102552-5624447b1e6c // THIS MUST BE CHANGED TO ACTUAL MAIN BEFORE MERGE + github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219163020-f6aebf2f4029 // THIS MUST BE CHANGED TO ACTUAL MAIN BEFORE MERGE github.com/sirupsen/logrus v1.9.3 github.com/slok/kubewebhook/v2 v2.6.0 k8s.io/api v0.30.3 diff --git a/images/webhooks/src/go.sum b/images/webhooks/src/go.sum index ae7e9263..f42bbb53 100644 --- a/images/webhooks/src/go.sum +++ b/images/webhooks/src/go.sum @@ -2,8 +2,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219102552-5624447b1e6c h1:u1NL77HKI3NegdB0QGAhFVFGDd4yMTD51p0LSYPXS5E= -github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219102552-5624447b1e6c/go.mod h1:bhgBeuAdLlDc9EQ5qI+/18iRj8Jfr2qfFwE1QnIoQM4= +github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219163020-f6aebf2f4029 h1:FPh831q6j1lpRKRPobRLAxVpnTtTyWOnTZjvP2NwUKQ= +github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219163020-f6aebf2f4029/go.mod h1:bhgBeuAdLlDc9EQ5qI+/18iRj8Jfr2qfFwE1QnIoQM4= 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=