removed table column repo_name changes

kube-tarian · Jun 14, 2024 · 1b32e3d · 1b32e3d
1 parent 3938b09
commit 1b32e3d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 20 deletions.
diff --git a/capten/agent/internal/api/app_config_sso.go b/capten/agent/internal/api/app_config_sso.go
@@ -2,7 +2,6 @@ package api
 
 import (
 	"context"
-	"strings"
 
 	"github.com/kube-tarian/kad/capten/common-pkg/credential"
 	"github.com/kube-tarian/kad/capten/common-pkg/pb/agentpb"
@@ -25,8 +24,6 @@ func (a *Agent) ConfigureAppSSO(ctx context.Context,
 		}, nil
 	}
 
-	a.prepareRepoName(appConfig)
-
 	if err := credential.StoreAppOauthCredential(ctx, req.ReleaseName, req.ClientId, req.ClientSecret); err != nil {
 		a.log.Errorf("failed to store oauth credential for app %s, %v", req.ReleaseName, err)
 		return &agentpb.ConfigureAppSSOResponse{
@@ -86,16 +83,6 @@ func (a *Agent) ConfigureAppSSO(ctx context.Context,
 	}, nil
 }
 
-func (a *Agent) prepareRepoName(appConfig *agentpb.SyncAppData) {
-	repoInfo := strings.Split(appConfig.Config.AppName, "/")
-
-	if len(repoInfo) != 2 {
-		a.log.Infof("App don't have repo name %s, using chartName as repoName", appConfig.Config.AppName)
-		repoInfo = []string{appConfig.Config.ChartName, appConfig.Config.AppName}
-	}
-	appConfig.Config.RepoName = repoInfo[0]
-}
-
 func (a *Agent) upgradeAppWithWorkflow(req *model.ApplicationInstallRequest,
 	appConfig *agentpb.SyncAppData) {
 	wd := workers.NewDeployment(a.tc, a.log)

diff --git a/capten/agent/internal/api/app_values_util.go b/capten/agent/internal/api/app_values_util.go
@@ -257,7 +257,7 @@ func deriveTemplateValues(overrideValues, templateValues []byte) ([]byte, error)
 func prepareAppDeployRequestFromSyncApp(data *agentpb.SyncAppData, values []byte) *model.ApplicationInstallRequest {
 	return &model.ApplicationInstallRequest{
 		PluginName:     "helm",
-		RepoName:       data.Config.RepoName,
+		RepoName:       prepareRepoName(data),
 		RepoURL:        data.Config.RepoURL,
 		ChartName:      data.Config.ChartName,
 		Namespace:      data.Config.Namespace,
@@ -268,3 +268,13 @@ func prepareAppDeployRequestFromSyncApp(data *agentpb.SyncAppData, values []byte
 		Timeout:        10,
 	}
 }
+
+func prepareRepoName(appConfig *agentpb.SyncAppData) string {
+	repoInfo := strings.Split(appConfig.Config.AppName, "/")
+
+	if len(repoInfo) != 2 {
+		// AppName don't have repo name, so using chartName as repoName
+		repoInfo = []string{appConfig.Config.ChartName, appConfig.Config.AppName}
+	}
+	return repoInfo[0]
+}
diff --git a/capten/common-pkg/capten-store/app_config_store.go b/capten/common-pkg/capten-store/app_config_store.go
@@ -35,7 +35,6 @@ func (a *Store) UpsertAppConfig(appData *agentpb.SyncAppData) error {
 	appConfig.Description = appData.Config.Description
 	appConfig.Icon = appData.Config.Icon
 	appConfig.AppName = appData.Config.ChartName
-	appConfig.RepoName = appData.Config.RepoName
 	appConfig.RepoURL = appData.Config.RepoURL
 	appConfig.Namespace = appData.Config.Namespace
 	appConfig.PrivilegedNamespace = appData.Config.PrivilegedNamespace
@@ -87,7 +86,6 @@ func (a *Store) GetAppConfig(appReleaseName string) (*agentpb.SyncAppData, error
 			Description:         appConfig.Description,
 			Icon:                appConfig.Icon,
 			ChartName:           appConfig.AppName,
-			RepoName:            appConfig.RepoName,
 			RepoURL:             appConfig.RepoURL,
 			Namespace:           appConfig.Namespace,
 			PrivilegedNamespace: appConfig.PrivilegedNamespace,
@@ -138,7 +136,6 @@ func (a *Store) GetAllApps() ([]*agentpb.SyncAppData, error) {
 				Description:         ac.Description,
 				Icon:                ac.Icon,
 				ChartName:           ac.AppName,
-				RepoName:            ac.RepoName,
 				RepoURL:             ac.RepoURL,
 				Namespace:           ac.Namespace,
 				PrivilegedNamespace: ac.PrivilegedNamespace,

diff --git a/capten/common-pkg/capten-store/model.go b/capten/common-pkg/capten-store/model.go
@@ -92,7 +92,6 @@ type ClusterAppConfig struct {
 	PluginStoreType     int       `json:"plugin_store_type" gorm:"column:plugin_store_type"`
 	Category            string    `json:"category" gorm:"column:category"`
 	Description         string    `json:"description" gorm:"column:description"`
-	RepoName            string    `json:"repo_name" gorm:"column:repo_name"`
 	RepoURL             string    `json:"repo_url" gorm:"column:repo_url"`
 	Version             string    `json:"version" gorm:"column:version"`
 	Namespace           string    `json:"namespace" gorm:"column:namespace"`

diff --git a/capten/common-pkg/pb/agentpb/agent.pb.go b/capten/common-pkg/pb/agentpb/agent.pb.go
diff --git a/capten/deployment-worker/internal/workflows/plugin_workflow.go b/capten/deployment-worker/internal/workflows/plugin_workflow.go
@@ -232,7 +232,6 @@ func executeAppDeployment(
 			Category:            req.Category,
 			Description:         req.Description,
 			ChartName:           req.ChartName + "/" + req.ChartName,
-			RepoName:            req.ChartName,
 			RepoURL:             req.ChartRepo,
 			Namespace:           req.DefaultNamespace,
 			CreateNamespace:     true,