fix: config version

konstructio · Mar 13, 2024 · ae0e4a2 · ae0e4a2
1 parent e1238a5
commit ae0e4a2
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 147 deletions.
diff --git a/cmd/akamai/create.go b/cmd/akamai/create.go
@@ -13,6 +13,7 @@ import (
 	"github.com/kubefirst/kubefirst/internal/catalog"
 	"github.com/kubefirst/kubefirst/internal/cluster"
 	"github.com/kubefirst/kubefirst/internal/gitShim"
+	"github.com/kubefirst/kubefirst/internal/launch"
 	"github.com/kubefirst/kubefirst/internal/progress"
 	"github.com/kubefirst/kubefirst/internal/provision"
 	"github.com/kubefirst/kubefirst/internal/utilities"
@@ -75,10 +76,10 @@ func createAkamai(cmd *cobra.Command, args []string) error {
 	viper.Set(fmt.Sprintf("kubefirst-checks.%s-credentials", cliFlags.GitProvider), true)
 	viper.WriteConfig()
 
-	// k3dClusterCreationComplete := viper.GetBool("launch.deployed")
-	// if !k3dClusterCreationComplete {
-	// 	launch.Up(nil, true, cliFlags.UseTelemetry)
-	// }
+	k3dClusterCreationComplete := viper.GetBool("launch.deployed")
+	if !k3dClusterCreationComplete {
+		launch.Up(nil, true, cliFlags.UseTelemetry)
+	}
 
 	err = pkg.IsAppAvailable(fmt.Sprintf("%s/api/proxyHealth", cluster.GetConsoleIngresUrl()), "kubefirst api")
 	if err != nil {

diff --git a/configs/config.go b/configs/config.go
diff --git a/configs/viperConfig.go b/configs/viperConfig.go
diff --git a/internal/common/common.go b/internal/common/common.go
@@ -16,10 +16,10 @@ import (
 	"strings"
 
 	"github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
-	"github.com/kubefirst/kubefirst/configs"
 	"github.com/kubefirst/kubefirst/internal/cluster"
 	"github.com/kubefirst/kubefirst/internal/launch"
 	"github.com/kubefirst/kubefirst/internal/progress"
+	"github.com/kubefirst/runtime/configs"
 	"github.com/kubefirst/runtime/pkg/docker"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"

diff --git a/internal/progress/message.go b/internal/progress/message.go
@@ -111,6 +111,14 @@ func DisplaySuccessMessage(cluster types.Cluster) successMsg {
 
 	}
 
+	var fullDomainName string
+
+	if cluster.SubdomainName != "" {
+		fullDomainName = fmt.Sprintf("%s.%s", cluster.SubdomainName, cluster.DomainName)
+	} else {
+		fullDomainName = cluster.DomainName
+	}
+
 	success := `
 ##
 #### :tada: Success` + "`Cluster " + cluster.ClusterName + " is now up and running`" + `
@@ -125,11 +133,11 @@ func DisplaySuccessMessage(cluster types.Cluster) successMsg {
 ### Repos       ` + fmt.Sprintf("`https://%s.com/%s/gitops` \n\n", cluster.GitProvider, cluster.GitAuth.Owner) +
 		fmt.Sprintf("`            https://%s.com/%s/metaphor`", cluster.GitProvider, cluster.GitAuth.Owner) + `
 ## Kubefirst Console
-### URL         ` + fmt.Sprintf("`https://kubefirst.%s`", cluster.DomainName) + `
+### URL         ` + fmt.Sprintf("`https://kubefirst.%s`", fullDomainName) + `
 ## Argo CD
-### URL         ` + fmt.Sprintf("`https://argocd.%s`", cluster.DomainName) + `
+### URL         ` + fmt.Sprintf("`https://argocd.%s`", fullDomainName) + `
 ## Vault 
-### URL         ` + fmt.Sprintf("`https://vault.%s`", cluster.DomainName) + `
+### URL         ` + fmt.Sprintf("`https://vault.%s`", fullDomainName) + `
 
 
 ### :bulb: Quick start examples:

diff --git a/internal/segment/segment.go b/internal/segment/segment.go
@@ -4,8 +4,8 @@ import (
 	"os"
 
 	"github.com/denisbrodbeck/machineid"
-	"github.com/kubefirst/kubefirst/configs"
 	"github.com/kubefirst/metrics-client/pkg/telemetry"
+	"github.com/kubefirst/runtime/configs"
 	"github.com/kubefirst/runtime/pkg/k3d"
 )
 

diff --git a/internal/utilities/utilities.go b/internal/utilities/utilities.go
@@ -9,7 +9,6 @@ package utilities
 import (
 	"bufio"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -18,9 +17,9 @@ import (
 	"time"
 
 	apiTypes "github.com/kubefirst/kubefirst-api/pkg/types"
-	"github.com/kubefirst/kubefirst/configs"
 	"github.com/kubefirst/kubefirst/internal/progress"
 	"github.com/kubefirst/kubefirst/internal/types"
+	"github.com/kubefirst/runtime/configs"
 	"github.com/kubefirst/runtime/pkg/k8s"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
@@ -45,10 +44,6 @@ func CreateK1ClusterDirectory(clusterName string) {
 	}
 }
 
-const (
-	exportFilePath = "/tmp/api/cluster/export"
-)
-
 func CreateClusterRecordFromRaw(
 	useTelemetry bool,
 	gitOwner string,
@@ -238,24 +233,23 @@ func ExportCluster(cluster apiTypes.Cluster, kcfg *k8s.KubernetesClient) error {
 
 	time.Sleep(time.Second * 10)
 
-	payload, err := json.Marshal(cluster)
+	bytes, err := json.Marshal(cluster)
 	if err != nil {
 		log.Error().Msg(err.Error())
 		return err
 	}
 
+	secretValuesMap, _ := ParseJSONToMap(string(bytes))
+
 	secret := &v1secret.Secret{
-		ObjectMeta: metav1.ObjectMeta{Name: "mongodb-state", Namespace: "kubefirst"},
-		Data: map[string][]byte{
-			"cluster-0":    []byte(payload),
-			"cluster-name": []byte(cluster.ClusterName),
-		},
+		ObjectMeta: metav1.ObjectMeta{Name: "kubefirst-initial-state", Namespace: "kubefirst"},
+		Data:       secretValuesMap,
 	}
 
 	err = k8s.CreateSecretV2(kcfg.Clientset, secret)
 
 	if err != nil {
-		return errors.New(fmt.Sprintf("unable to save secret to management cluster. %s", err))
+		return fmt.Errorf(fmt.Sprintf("unable to save secret to management cluster. %s", err))
 	}
 
 	viper.Set("kubefirst-checks.secret-export-state", true)
@@ -296,3 +290,31 @@ func ConsumeStream(url string) {
 		return
 	}
 }
+
+func ParseJSONToMap(jsonStr string) (map[string][]byte, error) {
+	var result map[string]interface{}
+	err := json.Unmarshal([]byte(jsonStr), &result)
+	if err != nil {
+		return nil, err
+	}
+
+	secretData := make(map[string][]byte)
+	for key, value := range result {
+		switch v := value.(type) {
+		case map[string]interface{}, []interface{}: // For nested structures, marshal back to JSON
+			bytes, err := json.Marshal(v)
+			if err != nil {
+				return nil, err
+			}
+			secretData[key] = bytes
+		default:
+			bytes, err := json.Marshal(v)
+			if err != nil {
+				return nil, err
+			}
+			secretData[key] = bytes
+		}
+	}
+
+	return secretData, nil
+}