Skip to content

Commit

Permalink
Signed-off-by: v.oleynikov <vasily.oleynikov@flant.com>
Browse files Browse the repository at this point in the history
  • Loading branch information
@duckhawk
duckhawk committed Feb 25, 2025
1 parent 70c8481 commit 0ae0595
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 20 deletions.
2 changes: 1 addition & 1 deletion images/sds-local-volume-controller/src/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-20250219163020-f6aebf2f4029 // THIS MUST BE CHANGED TO ACTUAL MAIN BEFORE MERGE
github.com/deckhouse/sds-node-configurator/api v0.0.0-20250225084914-1778068d1911
github.com/go-logr/logr v1.4.2
github.com/onsi/ginkgo/v2 v2.20.0
github.com/onsi/gomega v1.34.1
Expand Down
4 changes: 2 additions & 2 deletions images/sds-local-volume-controller/src/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-20250219163020-f6aebf2f4029 h1:FPh831q6j1lpRKRPobRLAxVpnTtTyWOnTZjvP2NwUKQ=
github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219163020-f6aebf2f4029/go.mod h1:bhgBeuAdLlDc9EQ5qI+/18iRj8Jfr2qfFwE1QnIoQM4=
github.com/deckhouse/sds-node-configurator/api v0.0.0-20250225084914-1778068d1911 h1:FSADbTFYKY3eOTvXEV5LxUzOmJ+BsZ6+WO8hQsbJN7s=
github.com/deckhouse/sds-node-configurator/api v0.0.0-20250225084914-1778068d1911/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=
Expand Down
2 changes: 1 addition & 1 deletion images/sds-local-volume-csi/src/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-20250219163020-f6aebf2f4029 // THIS MUST BE CHANGED TO ACTUAL MAIN BEFORE MERGE
github.com/deckhouse/sds-node-configurator/api v0.0.0-20250225084914-1778068d1911
github.com/go-logr/logr v1.4.2
github.com/golang/protobuf v1.5.4
github.com/google/uuid v1.6.0
Expand Down
4 changes: 2 additions & 2 deletions images/sds-local-volume-csi/src/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-20250219163020-f6aebf2f4029 h1:FPh831q6j1lpRKRPobRLAxVpnTtTyWOnTZjvP2NwUKQ=
github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219163020-f6aebf2f4029/go.mod h1:bhgBeuAdLlDc9EQ5qI+/18iRj8Jfr2qfFwE1QnIoQM4=
github.com/deckhouse/sds-node-configurator/api v0.0.0-20250225084914-1778068d1911 h1:FSADbTFYKY3eOTvXEV5LxUzOmJ+BsZ6+WO8hQsbJN7s=
github.com/deckhouse/sds-node-configurator/api v0.0.0-20250225084914-1778068d1911/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=
Expand Down
17 changes: 11 additions & 6 deletions images/sds-local-volume-csi/src/pkg/utils/func.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,14 +268,19 @@ func DeleteLVMLogicalVolume(ctx context.Context, kc client.Client, log *logger.L
return fmt.Errorf("get LVMLogicalVolume %s: %w", lvmLogicalVolumeName, err)
}

llvThickSpec := &snc.LVMLogicalVolumeThickSpec{}
if llv.Spec.Thick != nil && llv.Spec.Thick.Contiguous != nil {
llvThickSpec.Contiguous = llv.Spec.Thick.Contiguous
}
if volumeCleanup != "disable" {
llvThickSpec.VolumeCleanup = &volumeCleanup
if llv.Spec.Thick != nil {
llv.Spec.Thick.VolumeCleanup = &volumeCleanup
} else {
llv.Spec.Thick = &snc.LVMLogicalVolumeThickSpec{
VolumeCleanup: &volumeCleanup,
}
}
} else {
if llv.Spec.Thick != nil {
llv.Spec.Thick.VolumeCleanup = nil
}
}
llv.Spec.Thick = llvThickSpec
err = kc.Update(ctx, llv)
if err != nil {
return fmt.Errorf("update LVMLogicalVolume %s: %w", lvmLogicalVolumeName, err)
Expand Down
2 changes: 1 addition & 1 deletion images/sds-local-volume-scheduler-extender/src/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-20250219163020-f6aebf2f4029 // THIS MUST BE CHANGED TO ACTUAL MAIN BEFORE MERGE
github.com/deckhouse/sds-node-configurator/api v0.0.0-20250225084914-1778068d1911
github.com/go-logr/logr v1.4.2
github.com/go-logr/zapr v1.3.0
github.com/spf13/cobra v1.8.1
Expand Down
4 changes: 2 additions & 2 deletions images/sds-local-volume-scheduler-extender/src/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-20250219163020-f6aebf2f4029 h1:FPh831q6j1lpRKRPobRLAxVpnTtTyWOnTZjvP2NwUKQ=
github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219163020-f6aebf2f4029/go.mod h1:bhgBeuAdLlDc9EQ5qI+/18iRj8Jfr2qfFwE1QnIoQM4=
github.com/deckhouse/sds-node-configurator/api v0.0.0-20250225084914-1778068d1911 h1:FSADbTFYKY3eOTvXEV5LxUzOmJ+BsZ6+WO8hQsbJN7s=
github.com/deckhouse/sds-node-configurator/api v0.0.0-20250225084914-1778068d1911/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=
Expand Down
2 changes: 1 addition & 1 deletion images/webhooks/src/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-20250219163020-f6aebf2f4029 // THIS MUST BE CHANGED TO ACTUAL MAIN BEFORE MERGE
github.com/deckhouse/sds-node-configurator/api v0.0.0-20250225084914-1778068d1911
github.com/sirupsen/logrus v1.9.3
github.com/slok/kubewebhook/v2 v2.6.0
k8s.io/api v0.30.3
Expand Down
4 changes: 2 additions & 2 deletions images/webhooks/src/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-20250219163020-f6aebf2f4029 h1:FPh831q6j1lpRKRPobRLAxVpnTtTyWOnTZjvP2NwUKQ=
github.com/deckhouse/sds-node-configurator/api v0.0.0-20250219163020-f6aebf2f4029/go.mod h1:bhgBeuAdLlDc9EQ5qI+/18iRj8Jfr2qfFwE1QnIoQM4=
github.com/deckhouse/sds-node-configurator/api v0.0.0-20250225084914-1778068d1911 h1:FSADbTFYKY3eOTvXEV5LxUzOmJ+BsZ6+WO8hQsbJN7s=
github.com/deckhouse/sds-node-configurator/api v0.0.0-20250225084914-1778068d1911/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=
Expand Down
4 changes: 2 additions & 2 deletions templates/sds-local-volume-csi/controller.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,8 @@ spec:
- name: {{ .Chart.Name }}-module-registry
restartPolicy: Always
schedulerName: default-scheduler
serviceAccount: default
serviceAccountName: default
serviceAccount: csi
serviceAccountName: csi
terminationGracePeriodSeconds: 30
volumes:
- hostPath:
Expand Down

0 comments on commit 0ae0595

Please sign in to comment.