feat: runtime migration (#368)

konstructio · Jul 16, 2024 · ccd331f · ccd331f
1 parent ceed503
commit ccd331f
Show file tree

Hide file tree

Showing 48 changed files with 215 additions and 91 deletions.
diff --git a/internal/configs/config.go → configs/config.go b/internal/configs/config.go → configs/config.go
@@ -23,6 +23,7 @@ environment variables and general config data.
 */
 
 const DefaultK1Version = "development"
+const DefaultGitOpsTemplateBranch = "main"
 
 // K1Version is used on version command. The value is dynamically updated on build time via ldflag. Built Kubefirst
 // versions will follow semver value like 1.9.0, when not using the built version, "development" is used.

diff --git a/internal/configs/kubefirstDirectory.go → configs/kubefirstDirectory.go b/internal/configs/kubefirstDirectory.go → configs/kubefirstDirectory.go
diff --git a/internal/configs/kubefirstFile.go → configs/kubefirstFile.go b/internal/configs/kubefirstFile.go → configs/kubefirstFile.go
diff --git a/internal/configs/viperConfig.go → configs/viperConfig.go b/internal/configs/viperConfig.go → configs/viperConfig.go
diff --git a/internal/argocd/argocd_test.go b/internal/argocd/argocd_test.go
@@ -11,8 +11,8 @@ import (
 	"net/http"
 	"testing"
 
+	"github.com/kubefirst/kubefirst-api/configs"
 	pkg "github.com/kubefirst/kubefirst-api/internal"
-	"github.com/kubefirst/kubefirst-api/internal/configs"
 	"github.com/spf13/viper"
 )
 

diff --git a/internal/common.go b/internal/common.go
@@ -4,7 +4,7 @@ Copyright (C) 2021-2023, Kubefirst
 This program is licensed under MIT.
 See the LICENSE file for more details.
 */
-package pkg
+package internal
 
 import (
 	"net/http"

diff --git a/internal/constants.go b/internal/constants.go
@@ -4,7 +4,7 @@ Copyright (C) 2021-2023, Kubefirst
 This program is licensed under MIT.
 See the LICENSE file for more details.
 */
-package pkg
+package internal
 
 import (
 	"fmt"

diff --git a/internal/controller/controller.go b/internal/controller/controller.go
@@ -34,10 +34,6 @@ import (
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
-const (
-	gitopsTemplateVersion = "v2.4.12"
-)
-
 type ClusterController struct {
 	CloudProvider             string
 	CloudRegion               string
@@ -210,7 +206,7 @@ func (clctrl *ClusterController) InitController(def *pkgtypes.ClusterDefinition)
 	if def.GitopsTemplateBranch != "" {
 		clctrl.GitopsTemplateBranch = def.GitopsTemplateBranch
 	} else {
-		clctrl.GitopsTemplateBranch = gitopsTemplateVersion
+		clctrl.GitopsTemplateBranch = env.KubefirstVersion
 	}
 
 	if def.GitopsTemplateURL != "" {

diff --git a/internal/env/env.go b/internal/env/env.go
@@ -9,7 +9,7 @@ import (
 type Env struct {
 	ServerPort            string `env:"SERVER_PORT" envDefault:"8081"`
 	K1AccessToken         string `env:"K1_ACCESS_TOKEN"`
-	KubefirstVersion      string `env:"KUBEFIRST_VERSION" envDefault:"development"`
+	KubefirstVersion      string `env:"KUBEFIRST_VERSION" envDefault:"main"`
 	CloudProvider         string `env:"CLOUD_PROVIDER"`
 	ClusterId             string `env:"CLUSTER_ID"`
 	ClusterType           string `env:"CLUSTER_TYPE"`

diff --git a/internal/helpers.go b/internal/helpers.go
@@ -4,7 +4,7 @@ Copyright (C) 2021-2023, Kubefirst
 This program is licensed under MIT.
 See the LICENSE file for more details.
 */
-package pkg
+package internal
 
 import (
 	"errors"
@@ -24,7 +24,7 @@ import (
 
 	"github.com/kubefirst/kubefirst-api/internal/progressPrinter"
 
-	"github.com/kubefirst/kubefirst-api/internal/configs"
+	"github.com/kubefirst/kubefirst-api/configs"
 	"github.com/spf13/viper"
 )
 

diff --git a/internal/helpers_test.go b/internal/helpers_test.go
@@ -4,7 +4,7 @@ Copyright (C) 2021-2023, Kubefirst
 This program is licensed under MIT.
 See the LICENSE file for more details.
 */
-package pkg
+package internal
 
 import (
 	"fmt"

diff --git a/internal/k3d/detokenize.go b/internal/k3d/detokenize.go
@@ -14,7 +14,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/kubefirst/kubefirst-api/internal/configs"
+	"github.com/kubefirst/kubefirst-api/configs"
 )
 
 // detokenizeGitGitops - Translate tokens by values on a given path

diff --git a/pkg/k8s/secret.go → internal/k8s/k8s.go b/pkg/k8s/secret.go → internal/k8s/k8s.go
@@ -1,37 +1,15 @@
-/*
-Copyright (C) 2021-2023, Kubefirst
-
-This program is licensed under MIT.
-See the LICENSE file for more details.
-*/
 package k8s
 
 import (
 	"context"
-	"encoding/json"
 
 	"github.com/rs/zerolog/log"
-	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 )
 
-// CreateSecretV2 creates a Kubernetes Secret
-func CreateSecretV2(clientset *kubernetes.Clientset, secret *v1.Secret) error {
-	_, err := clientset.CoreV1().Secrets(secret.Namespace).Create(
-		context.Background(),
-		secret,
-		metav1.CreateOptions{},
-	)
-	if err != nil {
-		return err
-	}
-	log.Info().Msgf("created Secret %s in Namespace %s\n", secret.Name, secret.Namespace)
-	return nil
-}
-
 // ReadSecretV2 reads the content of a Kubernetes Secret
-func ReadSecretV2(clientset *kubernetes.Clientset, namespace string, secretName string) (map[string]interface{}, error) {
+func ReadSecretV2Old(clientset *kubernetes.Clientset, namespace string, secretName string) (map[string]interface{}, error) {
 	secret, err := clientset.CoreV1().Secrets(namespace).Get(context.Background(), secretName, metav1.GetOptions{})
 	if err != nil {
 		log.Warn().Msgf("no secret found: %s\n", err)
@@ -78,11 +56,3 @@ func UpdateSecretV2(clientset *kubernetes.Clientset, namespace string, secretNam
 	log.Info().Msgf("updated Secret %s in Namespace %s\n", currentSecret.Name, currentSecret.Namespace)
 	return nil
 }
-
-func mapToJSON(data map[string]interface{}) (string, error) {
-	jsonBytes, err := json.Marshal(data)
-	if err != nil {
-		return "", err // Handle error.
-	}
-	return string(jsonBytes), nil
-}
diff --git a/internal/log.go b/internal/log.go
@@ -4,7 +4,7 @@ Copyright (C) 2021-2023, Kubefirst
 This program is licensed under MIT.
 See the LICENSE file for more details.
 */
-package pkg
+package internal
 
 import (
 	"os"

diff --git a/internal/mocks.go b/internal/mocks.go
@@ -4,7 +4,7 @@ Copyright (C) 2021-2023, Kubefirst
 This program is licensed under MIT.
 See the LICENSE file for more details.
 */
-package pkg
+package internal
 
 import (
 	"net/http"

diff --git a/internal/progress_bar.go b/internal/progress_bar.go
@@ -4,7 +4,7 @@ Copyright (C) 2021-2023, Kubefirst
 This program is licensed under MIT.
 See the LICENSE file for more details.
 */
-package pkg
+package internal
 
 import (
 	"fmt"

diff --git a/internal/router/api/v1/secrets.go b/internal/router/api/v1/secrets.go
@@ -11,10 +11,10 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/kubefirst/kubefirst-api/internal/k8s"
 	"github.com/kubefirst/kubefirst-api/internal/secrets"
 	"github.com/kubefirst/kubefirst-api/internal/types"
 	"github.com/kubefirst/kubefirst-api/internal/utils"
-	"github.com/kubefirst/kubefirst-api/pkg/k8s"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -37,7 +37,7 @@ func GetClusterSecret(c *gin.Context) {
 	}
 
 	kcfg := utils.GetKubernetesClient(clusterName)
-	kubefirstSecrets, _ := k8s.ReadSecretV2(kcfg.Clientset, "kubefirst", secret)
+	kubefirstSecrets, _ := k8s.ReadSecretV2Old(kcfg.Clientset, "kubefirst", secret)
 
 	jsonString, err := secrets.MapToStructuredJSON(kubefirstSecrets)
 

diff --git a/internal/secrets/clusters.go b/internal/secrets/clusters.go
@@ -10,7 +10,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/kubefirst/kubefirst-api/pkg/k8s"
+	"github.com/kubefirst/kubefirst-api/internal/k8s"
 	pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
 	log "github.com/rs/zerolog/log"
 	v1 "k8s.io/api/core/v1"
@@ -42,7 +42,7 @@ func DeleteCluster(clientSet *kubernetes.Clientset, clusterName string) error {
 func GetCluster(clientSet *kubernetes.Clientset, clusterName string) (pkgtypes.Cluster, error) {
 	cluster := pkgtypes.Cluster{}
 
-	clusterSecret, err := k8s.ReadSecretV2(clientSet, "kubefirst", fmt.Sprintf("%s-%s", KUBEFIRST_CLUSTER_PREFIX, clusterName))
+	clusterSecret, err := k8s.ReadSecretV2Old(clientSet, "kubefirst", fmt.Sprintf("%s-%s", KUBEFIRST_CLUSTER_PREFIX, clusterName))
 	if err != nil {
 		return cluster, fmt.Errorf("secret not found: %s", err)
 	}

diff --git a/internal/secrets/environments.go b/internal/secrets/environments.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"github.com/kubefirst/kubefirst-api/internal/k8s"
 	"github.com/kubefirst/kubefirst-api/internal/types"
-	"github.com/kubefirst/kubefirst-api/pkg/k8s"
 	pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
 	log "github.com/rs/zerolog/log"
 	"go.mongodb.org/mongo-driver/bson/primitive"
@@ -35,7 +35,7 @@ func GetEnvironments(clientSet *kubernetes.Clientset) ([]pkgtypes.Environment, e
 func GetEnvironment(clientSet *kubernetes.Clientset, name string) (pkgtypes.Environment, error) {
 	environment := pkgtypes.Environment{}
 
-	kubefirstSecrets, _ := k8s.ReadSecretV2(clientSet, "kubefirst", fmt.Sprintf("%s-%s", KUBEFIRST_ENVIRONMENT_PREFIX, name))
+	kubefirstSecrets, _ := k8s.ReadSecretV2Old(clientSet, "kubefirst", fmt.Sprintf("%s-%s", KUBEFIRST_ENVIRONMENT_PREFIX, name))
 	jsonString, _ := MapToStructuredJSON(kubefirstSecrets)
 
 	jsonData, err := json.Marshal(jsonString)

diff --git a/internal/secrets/gitopsCatalog.go b/internal/secrets/gitopsCatalog.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 
 	"github.com/kubefirst/kubefirst-api/internal/gitopsCatalog"
-	"github.com/kubefirst/kubefirst-api/pkg/k8s"
+	"github.com/kubefirst/kubefirst-api/internal/k8s"
 	"github.com/kubefirst/kubefirst-api/pkg/types"
 	log "github.com/rs/zerolog/log"
 	"golang.org/x/exp/slices"
@@ -48,7 +48,7 @@ func CreateGitopsCatalogApps(clientSet *kubernetes.Clientset, catalogApps types.
 func GetGitopsCatalogApps(clientSet *kubernetes.Clientset) (types.GitopsCatalogApps, error) {
 	catalogApps := types.GitopsCatalogApps{}
 
-	kubefirstSecrets, err := k8s.ReadSecretV2(clientSet, "kubefirst", KUBEFIRST_CATALOG_SECRET_NAME)
+	kubefirstSecrets, err := k8s.ReadSecretV2Old(clientSet, "kubefirst", KUBEFIRST_CATALOG_SECRET_NAME)
 	if err != nil {
 		return catalogApps, err
 	}

diff --git a/internal/secrets/import.go b/internal/secrets/import.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/kubefirst/kubefirst-api/internal/constants"
 	"github.com/kubefirst/kubefirst-api/internal/env"
-	"github.com/kubefirst/kubefirst-api/pkg/k8s"
+	"github.com/kubefirst/kubefirst-api/internal/k8s"
 	pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
 	"github.com/rs/zerolog/log"
 )
@@ -34,7 +34,7 @@ func ImportClusterIfEmpty(silent bool) (pkgtypes.Cluster, error) {
 
 	kcfg := k8s.CreateKubeConfig(true, "")
 	log.Info().Msg("reading secret kubefirst-initial-state to determine if import is needed")
-	secData, err := k8s.ReadSecretV2(kcfg.Clientset, "kubefirst", "kubefirst-initial-state")
+	secData, err := k8s.ReadSecretV2Old(kcfg.Clientset, "kubefirst", "kubefirst-initial-state")
 	if err != nil {
 		log.Info().Msgf("error reading secret kubefirst-initial-state. %s", err)
 		return cluster, err

diff --git a/internal/secrets/reference.go b/internal/secrets/reference.go
@@ -10,7 +10,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/kubefirst/kubefirst-api/pkg/k8s"
+	"github.com/kubefirst/kubefirst-api/internal/k8s"
 	pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -20,7 +20,7 @@ import (
 func GetSecretReference(clientSet *kubernetes.Clientset, secretName string) (pkgtypes.SecretListReference, error) {
 	secretReference := pkgtypes.SecretListReference{}
 
-	kubefirstSecrets, err := k8s.ReadSecretV2(clientSet, "kubefirst", secretName)
+	kubefirstSecrets, err := k8s.ReadSecretV2Old(clientSet, "kubefirst", secretName)
 	if err != nil {
 		return secretReference, fmt.Errorf("secret not found: %s", err)
 	}

diff --git a/internal/secrets/services.go b/internal/secrets/services.go
@@ -10,7 +10,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/kubefirst/kubefirst-api/pkg/k8s"
+	"github.com/kubefirst/kubefirst-api/internal/k8s"
 	"github.com/kubefirst/kubefirst-api/pkg/types"
 	log "github.com/rs/zerolog/log"
 	v1 "k8s.io/api/core/v1"
@@ -97,7 +97,7 @@ func GetService(clientSet *kubernetes.Clientset, clusterName string, serviceName
 func GetServices(clientSet *kubernetes.Clientset, clusterName string) (types.ClusterServiceList, error) {
 	clusterServices := types.ClusterServiceList{}
 
-	kubefirstSecrets, err := k8s.ReadSecretV2(clientSet, "kubefirst", fmt.Sprintf("%s-%s", KUBEFIRST_SERVICES_PREFIX, clusterName))
+	kubefirstSecrets, err := k8s.ReadSecretV2Old(clientSet, "kubefirst", fmt.Sprintf("%s-%s", KUBEFIRST_SERVICES_PREFIX, clusterName))
 
 	jsonString, err := MapToStructuredJSON(kubefirstSecrets)
 

diff --git a/internal/shell.go b/internal/shell.go
@@ -4,7 +4,7 @@ Copyright (C) 2021-2023, Kubefirst
 This program is licensed under MIT.
 See the LICENSE file for more details.
 */
-package pkg
+package internal
 
 import (
 	"bufio"

diff --git a/internal/utils/utils.go b/internal/utils/utils.go
@@ -16,8 +16,8 @@ import (
 
 	"github.com/kubefirst/kubefirst-api/internal/constants"
 	"github.com/kubefirst/kubefirst-api/internal/env"
+	"github.com/kubefirst/kubefirst-api/internal/k8s"
 	"github.com/kubefirst/kubefirst-api/internal/secrets"
-	"github.com/kubefirst/kubefirst-api/pkg/k8s"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"

diff --git a/internal/validations.go b/internal/validations.go
@@ -4,7 +4,7 @@ Copyright (C) 2021-2023, Kubefirst
 This program is licensed under MIT.
 See the LICENSE file for more details.
 */
-package pkg
+package internal
 
 import "syscall"
 

diff --git a/pkg/argocd/argocd.go b/pkg/argocd/argocd.go
@@ -0,0 +1,7 @@
+package argocd
+
+import "github.com/kubefirst/kubefirst-api/internal/argocd"
+
+var ArgocdSecretClient = argocd.ArgocdSecretClient
+var GetArgocdTokenV2 = argocd.GetArgocdTokenV2
+var GetArgoCDApplicationObject = argocd.GetArgoCDApplicationObject
diff --git a/pkg/aws/client.go b/pkg/aws/client.go
@@ -9,6 +9,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/credentials"
+	awsinternal "github.com/kubefirst/kubefirst-api/internal/aws"
 	"github.com/rs/zerolog/log"
 )
 
@@ -39,3 +40,8 @@ func NewEKSServiceAccountClientV1() aws.Config {
 
 	return awsClient
 }
+
+type AWSConfiguration = awsinternal.AWSConfiguration
+type QuotaDetailResponse = awsinternal.QuotaDetailResponse
+
+var NewAwsV2 = awsinternal.NewAwsV2
diff --git a/pkg/configs/configs.go b/pkg/configs/configs.go
@@ -0,0 +1,9 @@
+package configs
+
+import "github.com/kubefirst/kubefirst-api/configs"
+
+const DefaultK1Version = configs.DefaultK1Version
+
+var K1Version = configs.K1Version
+var ReadConfig = configs.ReadConfig
+var InitializeViperConfig = configs.InitializeViperConfig
diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
@@ -0,0 +1,13 @@
+package constants
+
+import internal "github.com/kubefirst/kubefirst-api/internal"
+
+const MinimumAvailableDiskSize = internal.MinimumAvailableDiskSize
+const MinioDefaultUsername = internal.MinioDefaultUsername
+const MinioDefaultPassword = internal.MinioDefaultPassword
+const KubefirstManifestRepoRef = internal.KubefirstManifestRepoRef
+const MinioPortForwardEndpoint = internal.MinioPortForwardEndpoint
+const MinioRegion = internal.MinioRegion
+
+var ArgoCDLocalURLTLS = internal.ArgoCDLocalURLTLS
+var KubefirstConsoleLocalURLTLS = internal.KubefirstConsoleLocalURLTLS
diff --git a/pkg/docker/docker.go b/pkg/docker/docker.go
@@ -0,0 +1,7 @@
+package docker
+
+import internal "github.com/kubefirst/kubefirst-api/internal/docker"
+
+type DockerClientWrapper = internal.DockerClientWrapper
+
+var NewDockerClient = internal.NewDockerClient