Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into thin-data-wipe
Browse files Browse the repository at this point in the history
  • Loading branch information
@asergunov
asergunov committed Mar 6, 2025
2 parents f40e310 + ab707b2 commit e25bb52
Show file tree
Hide file tree
Showing 52 changed files with 193 additions and 780 deletions.
8 changes: 4 additions & 4 deletions images/agent/cmd/llvs_ce.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ package main
import (
"sigs.k8s.io/controller-runtime/pkg/manager"

"agent/internal/cache"
"agent/internal/config"
"agent/internal/logger"
"agent/internal/monitoring"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/cache"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/config"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/logger"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/monitoring"
)

func addLLVSReconciler(
Expand Down
12 changes: 6 additions & 6 deletions images/agent/cmd/llvs_ee.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import (
"github.com/deckhouse/sds-node-configurator/lib/go/common/pkg/feature"
"sigs.k8s.io/controller-runtime/pkg/manager"

"agent/internal/cache"
"agent/internal/config"
"agent/internal/controller"
"agent/internal/controller/llvs"
"agent/internal/logger"
"agent/internal/monitoring"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/cache"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/config"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/controller"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/controller/llvs"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/logger"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/monitoring"
)

func addLLVSReconciler(
Expand Down
24 changes: 12 additions & 12 deletions images/agent/cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@ import (
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/metrics/server"

"agent/internal/cache"
"agent/internal/config"
"agent/internal/controller"
"agent/internal/controller/bd"
"agent/internal/controller/llv"
"agent/internal/controller/llv_extender"
"agent/internal/controller/lvg"
"agent/internal/kubutils"
"agent/internal/logger"
"agent/internal/monitoring"
"agent/internal/scanner"
"agent/internal/utils"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/cache"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/config"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/controller"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/controller/bd"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/controller/llv"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/controller/llv_extender"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/controller/lvg"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/kubutils"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/logger"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/monitoring"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/scanner"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/utils"
)

var (
Expand Down
14 changes: 6 additions & 8 deletions images/agent/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module agent
module github.com/deckhouse/sds-node-configurator/images/agent

go 1.23.4

toolchain go1.23.5
go 1.23.6

require (
github.com/deckhouse/sds-node-configurator/api v0.0.0-20250130211935-b68366dfd0f8
Expand All @@ -15,6 +13,8 @@ require (
github.com/pilebones/go-udev v0.9.0
github.com/prometheus/client_golang v1.19.1
github.com/stretchr/testify v1.9.0
go.uber.org/mock v0.5.0
golang.org/x/sys v0.30.0
k8s.io/api v0.32.1
k8s.io/apiextensions-apiserver v0.32.0
k8s.io/apimachinery v0.32.1
Expand All @@ -24,9 +24,9 @@ require (
sigs.k8s.io/controller-runtime v0.20.1
)

replace github.com/deckhouse/sds-node-configurator/api => ../../../api
replace github.com/deckhouse/sds-node-configurator/api => ../../api

replace github.com/deckhouse/sds-node-configurator/lib/go/common => ../../../lib/go/common
replace github.com/deckhouse/sds-node-configurator/lib/go/common => ../../lib/go/common

require (
github.com/beorn7/perks v1.0.1 // indirect
Expand Down Expand Up @@ -62,11 +62,9 @@ require (
github.com/prometheus/procfs v0.15.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.uber.org/mock v0.5.0 // indirect
golang.org/x/net v0.35.0 // indirect
golang.org/x/oauth2 v0.26.0 // indirect
golang.org/x/sync v0.11.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/term v0.29.0 // indirect
golang.org/x/text v0.22.0 // indirect
golang.org/x/time v0.10.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions images/agent/internal/cache/cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"reflect"
"sync"

"agent/internal"
"agent/internal/logger"
"github.com/deckhouse/sds-node-configurator/images/agent/internal"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/logger"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion images/agent/internal/cache/cache_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/stretchr/testify/assert"

"agent/internal"
"github.com/deckhouse/sds-node-configurator/images/agent/internal"
)

func TestCache(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions images/agent/internal/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"strings"
"time"

"agent/internal"
"agent/internal/logger"
"github.com/deckhouse/sds-node-configurator/images/agent/internal"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/logger"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion images/agent/internal/const.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package internal
import "k8s.io/apimachinery/pkg/api/resource"

const (
// LVGUpdateTriggerLabel if you change this value, you must change its value in sds-health-watcher-controller/src/pkg/block_device_labels_watcher.go as well
// LVGUpdateTriggerLabel if you change this value, you must change its value in sds-health-watcher-controller/pkg/block_device_labels_watcher.go as well
LVGUpdateTriggerLabel = "storage.deckhouse.io/update-trigger"

resizeDelta = "32Mi"
Expand Down
12 changes: 6 additions & 6 deletions images/agent/internal/controller/bd/discoverer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"agent/internal"
"agent/internal/cache"
"agent/internal/controller"
"agent/internal/logger"
"agent/internal/monitoring"
"agent/internal/utils"
"github.com/deckhouse/sds-node-configurator/images/agent/internal"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/cache"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/controller"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/logger"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/monitoring"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/utils"
)

const DiscovererName = "block-device-controller"
Expand Down
10 changes: 5 additions & 5 deletions images/agent/internal/controller/bd/discoverer_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"agent/internal"
"agent/internal/cache"
"agent/internal/logger"
"agent/internal/monitoring"
"agent/internal/test_utils"
"github.com/deckhouse/sds-node-configurator/images/agent/internal"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/cache"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/logger"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/monitoring"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/test_utils"
)

var _ = Describe("Storage Controller", func() {
Expand Down
12 changes: 6 additions & 6 deletions images/agent/internal/controller/bd/discoverer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"agent/internal"
"agent/internal/cache"
"agent/internal/logger"
"agent/internal/monitoring"
"agent/internal/test_utils"
"agent/internal/utils"
"github.com/deckhouse/sds-node-configurator/images/agent/internal"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/cache"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/logger"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/monitoring"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/test_utils"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/utils"
)

//go:embed testdata/lsblk_output.json
Expand Down
2 changes: 1 addition & 1 deletion images/agent/internal/controller/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

"agent/internal/logger"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/logger"
)

type ReconcileRequest[T client.Object] struct {
Expand Down
2 changes: 1 addition & 1 deletion images/agent/internal/controller/llv/llvs_ee.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/deckhouse/sds-node-configurator/lib/go/common/pkg/feature"
"k8s.io/apimachinery/pkg/types"

"agent/internal/utils"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/utils"
)

func (r *Reconciler) handleLLVSSource(ctx context.Context, llv *v1alpha1.LVMLogicalVolume, lvg *v1alpha1.LVMVolumeGroup) (string, bool, error) {
Expand Down
12 changes: 6 additions & 6 deletions images/agent/internal/controller/llv/reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ import (
"k8s.io/utils/strings/slices"
"sigs.k8s.io/controller-runtime/pkg/client"

"agent/internal"
"agent/internal/cache"
"agent/internal/controller"
"agent/internal/logger"
"agent/internal/monitoring"
"agent/internal/utils"
"github.com/deckhouse/sds-node-configurator/images/agent/internal"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/cache"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/controller"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/logger"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/monitoring"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/utils"
)

const ReconcilerName = "lvm-logical-volume-watcher-controller"
Expand Down
12 changes: 6 additions & 6 deletions images/agent/internal/controller/llv/reconciler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"agent/internal"
"agent/internal/cache"
"agent/internal/logger"
"agent/internal/monitoring"
"agent/internal/test_utils"
"agent/internal/utils"
"github.com/deckhouse/sds-node-configurator/images/agent/internal"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/cache"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/logger"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/monitoring"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/test_utils"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/utils"
)

func TestLVMLogicalVolumeWatcher(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions images/agent/internal/controller/llv_extender/reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (
"github.com/deckhouse/sds-node-configurator/api/v1alpha1"
"sigs.k8s.io/controller-runtime/pkg/client"

"agent/internal"
"agent/internal/cache"
"agent/internal/controller"
"agent/internal/logger"
"agent/internal/monitoring"
"agent/internal/utils"
"github.com/deckhouse/sds-node-configurator/images/agent/internal"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/cache"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/controller"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/logger"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/monitoring"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/utils"
)

const ReconcilerName = "lvm-logical-volume-extender-controller"
Expand Down
12 changes: 6 additions & 6 deletions images/agent/internal/controller/llvs/reconciler_ee.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ import (
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"

"agent/internal"
"agent/internal/cache"
"agent/internal/controller"
"agent/internal/logger"
"agent/internal/monitoring"
"agent/internal/utils"
"github.com/deckhouse/sds-node-configurator/images/agent/internal"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/cache"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/controller"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/logger"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/monitoring"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/utils"
)

const ReconcilerName = "lvm-logical-volume-snapshot-watcher-controller"
Expand Down
12 changes: 6 additions & 6 deletions images/agent/internal/controller/lvg/discoverer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import (
"k8s.io/apimachinery/pkg/util/uuid"
"sigs.k8s.io/controller-runtime/pkg/client"

"agent/internal"
"agent/internal/cache"
"agent/internal/controller"
"agent/internal/logger"
"agent/internal/monitoring"
"agent/internal/utils"
"github.com/deckhouse/sds-node-configurator/images/agent/internal"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/cache"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/controller"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/logger"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/monitoring"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/utils"
)

const DiscovererName = "lvm-volume-group-discover-controller"
Expand Down
10 changes: 5 additions & 5 deletions images/agent/internal/controller/lvg/discoverer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"agent/internal"
"agent/internal/cache"
"agent/internal/logger"
"agent/internal/monitoring"
"agent/internal/test_utils"
"github.com/deckhouse/sds-node-configurator/images/agent/internal"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/cache"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/logger"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/monitoring"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/test_utils"
)

func TestLVMVolumeGroupDiscover(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions images/agent/internal/controller/lvg/reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"agent/internal"
"agent/internal/cache"
"agent/internal/controller"
"agent/internal/logger"
"agent/internal/monitoring"
"agent/internal/utils"
"github.com/deckhouse/sds-node-configurator/images/agent/internal"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/cache"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/controller"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/logger"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/monitoring"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/utils"
)

const ReconcilerName = "lvm-volume-group-watcher-controller"
Expand Down
12 changes: 6 additions & 6 deletions images/agent/internal/controller/lvg/reconciler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import (
"k8s.io/utils/strings/slices"
"sigs.k8s.io/controller-runtime/pkg/client"

"agent/internal"
"agent/internal/cache"
"agent/internal/logger"
"agent/internal/monitoring"
"agent/internal/test_utils"
"agent/internal/utils"
"github.com/deckhouse/sds-node-configurator/images/agent/internal"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/cache"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/logger"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/monitoring"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/test_utils"
"github.com/deckhouse/sds-node-configurator/images/agent/internal/utils"
)

func TestLVMVolumeGroupWatcherCtrl(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion images/agent/internal/controller/lvg/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"agent/internal"
"github.com/deckhouse/sds-node-configurator/images/agent/internal"
)

func isApplied(lvg *v1alpha1.LVMVolumeGroup) bool {
Expand Down
2 changes: 1 addition & 1 deletion images/agent/internal/mock_utils/mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e25bb52

Please sign in to comment.