fix: merge (#311)

konstructio · Mar 12, 2024 · 157340c · 157340c
1 parent 7a8d689
commit 157340c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/internal/controller/kbot.go b/internal/controller/kbot.go
@@ -8,6 +8,7 @@ package controller
 
 import (
 	"github.com/kubefirst/kubefirst-api/internal/secrets"
+	pkg "github.com/kubefirst/kubefirst-api/pkg/utils"
 	"github.com/kubefirst/metrics-client/pkg/telemetry"
 	log "github.com/rs/zerolog/log"
 )

diff --git a/internal/controller/state.go b/internal/controller/state.go
@@ -227,25 +227,15 @@ func (clctrl *ClusterController) StateStoreCreate() error {
 				return err
 			}
 
-			err = clctrl.MdbCl.UpdateCluster(clctrl.ClusterName, "state_store_details", pkgtypes.StateStoreDetails{
+			clctrl.Cluster.StateStoreDetails = pkgtypes.StateStoreDetails{
 				Name:     bucketAndCreds.StateStoreDetails.Name,
 				Hostname: bucketAndCreds.StateStoreDetails.Hostname,
-			})
-			if err != nil {
-				return err
-			}
-
-			err = clctrl.MdbCl.UpdateCluster(clctrl.ClusterName, "state_store_create_check", true)
-			if err != nil {
-				return err
-			}
-
-			err = clctrl.MdbCl.UpdateCluster(clctrl.ClusterName, "state_store_credentials", bucketAndCreds.StateStoreCredentials)
-			if err != nil {
-				return err
 			}
+			clctrl.Cluster.StateStoreCreateCheck = true
+			clctrl.Cluster.StateStoreCredentials = bucketAndCreds.StateStoreCredentials
+			clctrl.Cluster.StateStoreCredsCheck = true
 
-			err = clctrl.MdbCl.UpdateCluster(clctrl.ClusterName, "state_store_creds_check", true)
+			err = secrets.UpdateCluster(clctrl.KubernetesClient, clctrl.Cluster)
 			if err != nil {
 				return err
 			}

diff --git a/internal/router/api/v1/cluster.go b/internal/router/api/v1/cluster.go
@@ -10,7 +10,6 @@ import (
 	"context"
 	"fmt"
 	"net/http"
-	"os"
 	"strings"
 
 	"github.com/gin-gonic/gin"