NewManagementClient allows usage of encrypted option as well, Fixes #14

k8ssandra · Feb 26, 2024 · d4bafee · d4bafee
1 parent 8bed5a0
commit d4bafee
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 22 deletions.
diff --git a/go.mod b/go.mod
@@ -9,14 +9,16 @@ require (
  github.com/charmbracelet/bubbletea v0.24.2
  github.com/charmbracelet/lipgloss v0.7.1
  github.com/google/uuid v1.3.0
- github.com/k8ssandra/cass-operator v1.17.3-0.20231020160518-5189bebc9531
+ github.com/k8ssandra/cass-operator v1.19.0
  github.com/k8ssandra/k8ssandra-operator v1.9.2
+ github.com/pkg/errors v0.9.1
  github.com/spf13/cobra v1.6.0
  github.com/spf13/pflag v1.0.5
  github.com/stretchr/testify v1.8.2
  gopkg.in/yaml.v3 v3.0.1
  helm.sh/helm/v3 v3.9.4
  k8s.io/api v0.26.4
+ k8s.io/apiextensions-apiserver v0.26.4
  k8s.io/apimachinery v0.26.4
  k8s.io/cli-runtime v0.26.4
  k8s.io/client-go v0.26.4
@@ -112,7 +114,6 @@ require (
  github.com/opencontainers/go-digest v1.0.0 // indirect
  github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
  github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
- github.com/pkg/errors v0.9.1 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
  github.com/prometheus/client_golang v1.15.1 // indirect
  github.com/prometheus/client_model v0.4.0 // indirect
@@ -145,7 +146,6 @@ require (
  google.golang.org/protobuf v1.30.0 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
- k8s.io/apiextensions-apiserver v0.26.4 // indirect
  k8s.io/apiserver v0.26.4 // indirect
  k8s.io/component-base v0.26.4 // indirect
  k8s.io/klog/v2 v2.100.1 // indirect

diff --git a/go.sum b/go.sum
@@ -364,8 +364,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/k8ssandra/cass-operator v1.17.3-0.20231020160518-5189bebc9531 h1:plGB8EBK8jEpbphiCkmNJNktjZwrTRlA2WzBTxEY9pU=
-github.com/k8ssandra/cass-operator v1.17.3-0.20231020160518-5189bebc9531/go.mod h1:8gYoASfrQYiDmvfMAeYSe31dO1qVe8uIISJeVXGFSiI=
+github.com/k8ssandra/cass-operator v1.19.0 h1:k+/IdbAowA8J5pV/YNy5mCqTn+I0ultdEJJYNSMP6NE=
+github.com/k8ssandra/cass-operator v1.19.0/go.mod h1:T25Qz8sj/R5JrjG9Wpo3/83o5MEw4pb/c8eiGqdnVcI=
 github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw=
 github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=

diff --git a/pkg/mgmtapi/client.go b/pkg/mgmtapi/client.go
@@ -4,27 +4,18 @@ import (
  "context"
 
  "github.com/k8ssandra/cass-operator/pkg/httphelper"
+ "github.com/k8ssandra/k8ssandra-client/pkg/cassdcutil"
+
  "sigs.k8s.io/controller-runtime/pkg/client"
- "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 // NewManagementClient returns a new instance for management-api go-client
-func NewManagementClient(ctx context.Context, client client.Client) (httphelper.NodeMgmtClient, error) {
- logger := log.FromContext(ctx)
-
- // We don't support authentication yet, so always use insecure
- provider := &httphelper.InsecureManagementApiSecurityProvider{}
- protocol := provider.GetProtocol()
-
- httpClient, err := provider.BuildHttpClient(client, ctx)
+func NewManagementClient(ctx context.Context, client client.Client, namespace, datacenter string) (httphelper.NodeMgmtClient, error) {
+ manager := cassdcutil.NewManager(client)
+ dc, err := manager.CassandraDatacenter(ctx, namespace, datacenter)
  if err != nil {
- logger.Error(err, "error in BuildManagementApiHttpClient")
  return httphelper.NodeMgmtClient{}, err
  }
 
- return httphelper.NodeMgmtClient{
- Client: httpClient,
- Log: logger,
- Protocol: protocol,
- }, nil
+ return httphelper.NewMgmtClient(ctx, client, dc)
 }
diff --git a/pkg/users/users.go b/pkg/users/users.go
@@ -13,7 +13,7 @@ import (
 
 func AddNewUsersFromSecret(ctx context.Context, c kubernetes.NamespacedClient, datacenter string, secretPath string, superusers bool) error {
  // Create ManagementClient
- mgmtClient, err := mgmtapi.NewManagementClient(ctx, c)
+ mgmtClient, err := mgmtapi.NewManagementClient(ctx, c, c.Namespace, datacenter)
  if err != nil {
  return err
  }
@@ -53,7 +53,7 @@ func targetPod(ctx context.Context, c kubernetes.NamespacedClient, datacenter st
 }
 
 func AddNewUser(ctx context.Context, c kubernetes.NamespacedClient, datacenter string, username string, password string, superuser bool) error {
- mgmtClient, err := mgmtapi.NewManagementClient(ctx, c)
+ mgmtClient, err := mgmtapi.NewManagementClient(ctx, c, c.Namespace, datacenter)
  if err != nil {
  return err
  }