From 012221a154f2011b476c5f81ea7d36976d4dec52 Mon Sep 17 00:00:00 2001 From: Maciej Zimnoch Date: Wed, 16 Dec 2020 20:08:11 +0100 Subject: [PATCH] scyllaclient: extract hosts to parameters in default config --- pkg/controllers/sidecar/sidecar_controller.go | 8 +++++++- pkg/scyllaclient/config.go | 6 ++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkg/controllers/sidecar/sidecar_controller.go b/pkg/controllers/sidecar/sidecar_controller.go index cfb57eed5b..c96ed84fb4 100644 --- a/pkg/controllers/sidecar/sidecar_controller.go +++ b/pkg/controllers/sidecar/sidecar_controller.go @@ -28,6 +28,7 @@ import ( "github.com/scylladb/scylla-operator/pkg/naming" "github.com/scylladb/scylla-operator/pkg/scyllaclient" "github.com/scylladb/scylla-operator/pkg/util/cfgutil" + "github.com/scylladb/scylla-operator/pkg/util/network" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -100,7 +101,12 @@ func New(ctx context.Context, mgr manager.Manager, logger log.Logger) (*MemberRe return nil, errors.Wrap(err, "get dynamic client") } - cfg := scyllaclient.DefaultConfig() + host, err := network.FindFirstNonLocalIP() + if err != nil { + return nil, errors.Wrap(err, "get scylla address") + } + + cfg := scyllaclient.DefaultConfig(host.String()) if err := cfgutil.ParseYAML(&cfg, naming.ScyllaClientConfigDirName+"/"+naming.ScyllaClientConfigFileName); err != nil { return nil, errors.Wrap(err, "parse scylla agent config") } diff --git a/pkg/scyllaclient/config.go b/pkg/scyllaclient/config.go index a2333bb37f..8e128c9270 100644 --- a/pkg/scyllaclient/config.go +++ b/pkg/scyllaclient/config.go @@ -5,7 +5,6 @@ import ( "time" "github.com/pkg/errors" - "github.com/scylladb/scylla-operator/pkg/util/network" "go.uber.org/multierr" ) @@ -48,10 +47,9 @@ type BackoffConfig struct { } // DefaultConfig returns a Config initialized with default values. -func DefaultConfig() Config { - host, _ := network.FindFirstNonLocalIP() +func DefaultConfig(hosts ...string) Config { return Config{ - Hosts: []string{host.String()}, + Hosts: hosts, Port: "10001", Scheme: "https", Timeout: 15 * time.Second,