From 308fd005aaa8ad7a05f277579599aeb521537f60 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 14 Oct 2022 11:09:15 +0200 Subject: [PATCH 1/2] remove storage-system events --- services/storage-system/pkg/config/config.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/services/storage-system/pkg/config/config.go b/services/storage-system/pkg/config/config.go index 0b6e5b52a..5a87745fc 100644 --- a/services/storage-system/pkg/config/config.go +++ b/services/storage-system/pkg/config/config.go @@ -13,9 +13,8 @@ type Config struct { Log *Log `yaml:"log"` Debug Debug `yaml:"debug"` - GRPC GRPCConfig `yaml:"grpc"` - HTTP HTTPConfig `yaml:"http"` - Events Events `yaml:"events"` + GRPC GRPCConfig `yaml:"grpc"` + HTTP HTTPConfig `yaml:"http"` TokenManager *TokenManager `yaml:"token_manager"` Reva *Reva `yaml:"reva"` @@ -76,8 +75,3 @@ type OCISDriver struct { // Root is the absolute path to the location of the data Root string `yaml:"root" env:"STORAGE_SYSTEM_OCIS_ROOT" desc:"Path for the directory where the STORAGE-SYSTEM service stores it's persistent data."` } - -type Events struct { - Addr string `yaml:"endpoint" env:"STORAGE_SYSTEM_EVENTS_ENDPOINT" desc:"The address of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture."` - ClusterID string `yaml:"cluster" env:"STORAGE_SYSTEM_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system."` -} From ab69ef79262ce3f08b1ff43c608c501942e5dbd7 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 14 Oct 2022 11:14:20 +0200 Subject: [PATCH 2/2] add changelog --- changelog/unreleased/remove-system-users-events-config.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/unreleased/remove-system-users-events-config.md diff --git a/changelog/unreleased/remove-system-users-events-config.md b/changelog/unreleased/remove-system-users-events-config.md new file mode 100644 index 000000000..496fba89e --- /dev/null +++ b/changelog/unreleased/remove-system-users-events-config.md @@ -0,0 +1,5 @@ +Bugfix: Remove the storage-users event configuration + +We've removed the events configuration from the storage-users section because it is not needed. + +https://github.com/owncloud/ocis/pull/4825