From d9c95e81d357ac8ceee4222aaaf9d7945b7c235a Mon Sep 17 00:00:00 2001 From: "v.oleynikov" Date: Fri, 1 Nov 2024 16:24:52 +0300 Subject: [PATCH 1/4] [internal] Add backup control label Signed-off-by: v.oleynikov Signed-off-by: Aleksandr Zimin --- crds/blockdevices.yaml | 1 + crds/lvmlogicalvolume.yaml | 1 + crds/lvmvolumegroup.yaml | 1 + crds/lvmvolumegroupbackup.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/crds/blockdevices.yaml b/crds/blockdevices.yaml index 9a8f6a59..794028ba 100644 --- a/crds/blockdevices.yaml +++ b/crds/blockdevices.yaml @@ -6,6 +6,7 @@ metadata: labels: heritage: deckhouse module: storage + backup.deckhouse.io/cluster-config: "true" spec: group: storage.deckhouse.io scope: Cluster diff --git a/crds/lvmlogicalvolume.yaml b/crds/lvmlogicalvolume.yaml index d21d619f..20f18492 100644 --- a/crds/lvmlogicalvolume.yaml +++ b/crds/lvmlogicalvolume.yaml @@ -6,6 +6,7 @@ metadata: labels: heritage: deckhouse module: storage + backup.deckhouse.io/cluster-config: "true" spec: group: storage.deckhouse.io scope: Cluster diff --git a/crds/lvmvolumegroup.yaml b/crds/lvmvolumegroup.yaml index bc99e489..157734e3 100644 --- a/crds/lvmvolumegroup.yaml +++ b/crds/lvmvolumegroup.yaml @@ -6,6 +6,7 @@ metadata: labels: heritage: deckhouse module: storage + backup.deckhouse.io/cluster-config: "true" spec: group: storage.deckhouse.io scope: Cluster diff --git a/crds/lvmvolumegroupbackup.yaml b/crds/lvmvolumegroupbackup.yaml index a1df3085..f58d0bdc 100644 --- a/crds/lvmvolumegroupbackup.yaml +++ b/crds/lvmvolumegroupbackup.yaml @@ -6,6 +6,7 @@ metadata: labels: heritage: deckhouse module: storage + backup.deckhouse.io/cluster-config: "true" spec: group: storage.deckhouse.io scope: Cluster From 2a5e400a56741f444014ab87c46980381ac1691f Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Sat, 9 Nov 2024 15:19:42 +0300 Subject: [PATCH 2/4] add backup label to lvmvolumegroupset Signed-off-by: Aleksandr Zimin --- crds/lvmvolumegroupset.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/crds/lvmvolumegroupset.yaml b/crds/lvmvolumegroupset.yaml index f973664b..1d045fe6 100644 --- a/crds/lvmvolumegroupset.yaml +++ b/crds/lvmvolumegroupset.yaml @@ -6,6 +6,7 @@ metadata: labels: heritage: deckhouse module: storage + backup.deckhouse.io/cluster-config: "true" spec: group: storage.deckhouse.io scope: Cluster From 0903df61e5f7d5ecff7955f59188dd876af0bac1 Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Sat, 9 Nov 2024 15:21:25 +0300 Subject: [PATCH 3/4] fix vers Signed-off-by: Aleksandr Zimin --- images/agent/src/go.mod | 2 +- images/sds-health-watcher-controller/src/go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/agent/src/go.mod b/images/agent/src/go.mod index 43018e69..7f08eb27 100644 --- a/images/agent/src/go.mod +++ b/images/agent/src/go.mod @@ -3,7 +3,7 @@ module agent go 1.22.2 require ( - github.com/deckhouse/sds-node-configurator/api v0.0.0-20241103120640-3e41c48c48fa + github.com/deckhouse/sds-node-configurator/api v0.0.0-20241104200552-c02b44d9b6a0 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 github.com/onsi/ginkgo/v2 v2.19.0 diff --git a/images/sds-health-watcher-controller/src/go.mod b/images/sds-health-watcher-controller/src/go.mod index 5eb1b4ad..0ca39814 100644 --- a/images/sds-health-watcher-controller/src/go.mod +++ b/images/sds-health-watcher-controller/src/go.mod @@ -4,7 +4,7 @@ go 1.22.3 require ( github.com/cloudflare/cfssl v1.5.0 - github.com/deckhouse/sds-node-configurator/api v0.0.0-20241103120640-3e41c48c48fa + github.com/deckhouse/sds-node-configurator/api v0.0.0-20241104200552-c02b44d9b6a0 github.com/go-logr/logr v1.4.2 github.com/prometheus/client_golang v1.19.1 github.com/stretchr/testify v1.9.0 From b7d5b1b37a6e893e2b2a0b221895b3a46c7089d8 Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Sat, 9 Nov 2024 15:22:18 +0300 Subject: [PATCH 4/4] fix Signed-off-by: Aleksandr Zimin --- images/agent/src/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/agent/src/go.mod b/images/agent/src/go.mod index 7f08eb27..2b7c84d4 100644 --- a/images/agent/src/go.mod +++ b/images/agent/src/go.mod @@ -6,6 +6,7 @@ require ( github.com/deckhouse/sds-node-configurator/api v0.0.0-20241104200552-c02b44d9b6a0 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 + github.com/gosimple/slug v1.14.0 github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 github.com/pilebones/go-udev v0.9.0 @@ -42,7 +43,6 @@ require ( github.com/google/gofuzz v1.2.0 // indirect github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect github.com/google/uuid v1.6.0 // indirect - github.com/gosimple/slug v1.14.0 // indirect github.com/gosimple/unidecode v1.0.1 // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/josharian/intern v1.0.0 // indirect