scyllaclient: extract hosts to parameters in default config

scylladb · Dec 18, 2020 · 012221a · 012221a
1 parent 3016c50
commit 012221a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -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,