feat: Dynamic handling of deployment templates

Wire.go

@@ -783,6 +783,11 @@ func InitializeApp() (*App, error) {
 		wire.Bind(new(pipeline.GlobalCMCSService), new(*pipeline.GlobalCMCSServiceImpl)),
 		repository.NewGlobalCMCSRepositoryImpl,
 		wire.Bind(new(repository.GlobalCMCSRepository), new(*repository.GlobalCMCSRepositoryImpl)),
+
+		chartRepoRepository.NewGlobalStrategyMetadataRepositoryImpl,
+		wire.Bind(new(chartRepoRepository.GlobalStrategyMetadataRepository), new(*chartRepoRepository.GlobalStrategyMetadataRepositoryImpl)),
+		chartRepoRepository.NewGlobalStrategyMetadataChartRefMappingRepositoryImpl,
+		wire.Bind(new(chartRepoRepository.GlobalStrategyMetadataChartRefMappingRepository), new(*chartRepoRepository.GlobalStrategyMetadataChartRefMappingRepositoryImpl)),
 	)
 	return &App{}, nil
 }

api/appbean/AppDetail.go

@@ -3,6 +3,7 @@ package appbean
 import (
 	"github.com/devtron-labs/devtron/internal/sql/models"
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
+	"github.com/devtron-labs/devtron/pkg/chartRepo/repository"
 	"github.com/devtron-labs/devtron/pkg/pipeline/bean"
 )
 
@@ -100,24 +101,24 @@ type BuildScript struct {
 }
 
 type CdPipelineDetails struct {
-	Name                          string                            `json:"name"` //pipelineName
-	EnvironmentName               string                            `json:"environmentName" `
-	TriggerType                   pipelineConfig.TriggerType        `json:"triggerType" validate:"required"`
-	DeploymentType                pipelineConfig.DeploymentTemplate `json:"deploymentType,omitempty" validate:"oneof=BLUE-GREEN ROLLING CANARY RECREATE"` //
-	DeploymentStrategies          []*DeploymentStrategy             `json:"deploymentStrategies"`
-	PreStage                      *CdStage                          `json:"preStage"`
-	PostStage                     *CdStage                          `json:"postStage"`
-	PreStageConfigMapSecretNames  *CdStageConfigMapSecretNames      `json:"preStageConfigMapSecretNames"`
-	PostStageConfigMapSecretNames *CdStageConfigMapSecretNames      `json:"postStageConfigMapSecretNames"`
-	RunPreStageInEnv              bool                              `json:"runPreStageInEnv"`
-	RunPostStageInEnv             bool                              `json:"runPostStageInEnv"`
-	IsClusterCdActive             bool                              `json:"isClusterCdActive"`
+	Name                          string                                 `json:"name"` //pipelineName
+	EnvironmentName               string                                 `json:"environmentName" `
+	TriggerType                   pipelineConfig.TriggerType             `json:"triggerType" validate:"required"`
+	DeploymentStrategyType        chartRepoRepository.DeploymentStrategy `json:"deploymentType,omitempty"` //
+	DeploymentStrategies          []*DeploymentStrategy                  `json:"deploymentStrategies"`
+	PreStage                      *CdStage                               `json:"preStage"`
+	PostStage                     *CdStage                               `json:"postStage"`
+	PreStageConfigMapSecretNames  *CdStageConfigMapSecretNames           `json:"preStageConfigMapSecretNames"`
+	PostStageConfigMapSecretNames *CdStageConfigMapSecretNames           `json:"postStageConfigMapSecretNames"`
+	RunPreStageInEnv              bool                                   `json:"runPreStageInEnv"`
+	RunPostStageInEnv             bool                                   `json:"runPostStageInEnv"`
+	IsClusterCdActive             bool                                   `json:"isClusterCdActive"`
 }
 
 type DeploymentStrategy struct {
-	DeploymentType pipelineConfig.DeploymentTemplate `json:"deploymentType,omitempty" validate:"oneof=BLUE-GREEN ROLLING CANARY RECREATE"` //
-	Config         map[string]interface{}            `json:"config,omitempty" validate:"string"`
-	IsDefault      bool                              `json:"isDefault" validate:"required"`
+	DeploymentStrategyType chartRepoRepository.DeploymentStrategy `json:"deploymentType,omitempty"` //
+	Config                 map[string]interface{}                 `json:"config,omitempty" validate:"string"`
+	IsDefault              bool                                   `json:"isDefault" validate:"required"`
 }
 
 type CdStage struct {

api/restHandler/CoreAppRestHandler.go

@@ -745,21 +745,21 @@ func (handler CoreAppRestHandlerImpl) buildCdPipelineResp(appId int, cdPipeline
 	}
 
 	cdPipelineResp := &appBean.CdPipelineDetails{
-		Name:              cdPipeline.Name,
-		EnvironmentName:   cdPipeline.EnvironmentName,
-		TriggerType:       cdPipeline.TriggerType,
-		DeploymentType:    cdPipeline.DeploymentTemplate,
-		RunPreStageInEnv:  cdPipeline.RunPreStageInEnv,
-		RunPostStageInEnv: cdPipeline.RunPostStageInEnv,
-		IsClusterCdActive: cdPipeline.CdArgoSetup,
+		Name:                   cdPipeline.Name,
+		EnvironmentName:        cdPipeline.EnvironmentName,
+		TriggerType:            cdPipeline.TriggerType,
+		DeploymentStrategyType: cdPipeline.DeploymentTemplate,
+		RunPreStageInEnv:       cdPipeline.RunPreStageInEnv,
+		RunPostStageInEnv:      cdPipeline.RunPostStageInEnv,
+		IsClusterCdActive:      cdPipeline.CdArgoSetup,
 	}
 
 	//build DeploymentStrategies resp
 	var deploymentTemplateStrategiesResp []*appBean.DeploymentStrategy
 	for _, strategy := range cdPipeline.Strategies {
 		deploymentTemplateStrategyResp := &appBean.DeploymentStrategy{
-			DeploymentType: strategy.DeploymentTemplate,
-			IsDefault:      strategy.Default,
+			DeploymentStrategyType: strategy.DeploymentTemplate,
+			IsDefault:              strategy.Default,
 		}
 		var configObj map[string]interface{}
 		if strategy.Config != nil {
@@ -1297,7 +1297,7 @@ func (handler CoreAppRestHandlerImpl) createDockerConfig(appId int, dockerConfig
 
 // create global template
 func (handler CoreAppRestHandlerImpl) createDeploymentTemplate(ctx context.Context, appId int, deploymentTemplate *appBean.DeploymentTemplate, userId int32) (error, int) {
-	handler.logger.Infow("Create App - creating deployment template", "appId", appId, "DeploymentTemplate", deploymentTemplate)
+	handler.logger.Infow("Create App - creating deployment template", "appId", appId, "DeploymentStrategy", deploymentTemplate)
 
 	createDeploymentTemplateRequest := chart.TemplateRequest{
 		AppId:               appId,
@@ -1630,7 +1630,7 @@ func (handler CoreAppRestHandlerImpl) createCdPipelines(ctx context.Context, app
 			Namespace:                     envModel.Namespace,
 			AppWorkflowId:                 workflowId,
 			CiPipelineId:                  ciPipelineId,
-			DeploymentTemplate:            cdPipeline.DeploymentType,
+			DeploymentTemplate:            cdPipeline.DeploymentStrategyType,
 			TriggerType:                   cdPipeline.TriggerType,
 			CdArgoSetup:                   cdPipeline.IsClusterCdActive,
 			RunPreStageInEnv:              cdPipeline.RunPreStageInEnv,
@@ -1962,7 +1962,7 @@ func convertCdDeploymentStrategies(deploymentStrategies []*appBean.DeploymentStr
 	var convertedStrategies []bean.Strategy
 	for _, deploymentStrategy := range deploymentStrategies {
 		convertedStrategy := bean.Strategy{
-			DeploymentTemplate: deploymentStrategy.DeploymentType,
+			DeploymentTemplate: deploymentStrategy.DeploymentStrategyType,
 			Default:            deploymentStrategy.IsDefault,
 		}
 		strategyConfig, err := json.Marshal(deploymentStrategy.Config)

internal/sql/repository/chartConfig/PipelineConfigRepository.go

@@ -18,29 +18,29 @@
 package chartConfig
 
 import (
-	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
+	"github.com/devtron-labs/devtron/pkg/chartRepo/repository"
 	"github.com/devtron-labs/devtron/pkg/sql"
 	"github.com/go-pg/pg"
 	"github.com/juju/errors"
 )
 
 type PipelineStrategy struct {
-	tableName  struct{}                          `sql:"pipeline_strategy" pg:",discard_unknown_columns"`
-	Id         int                               `sql:"id,pk"`
-	PipelineId int                               `sql:"pipeline_id"`
-	Strategy   pipelineConfig.DeploymentTemplate `sql:"strategy,notnull"`
-	Config     string                            `sql:"config"`
-	Default    bool                              `sql:"default,notnull"`
-	Deleted    bool                              `sql:"deleted,notnull"`
+	tableName  struct{}                               `sql:"pipeline_strategy" pg:",discard_unknown_columns"`
+	Id         int                                    `sql:"id,pk"`
+	PipelineId int                                    `sql:"pipeline_id"`
+	Strategy   chartRepoRepository.DeploymentStrategy `sql:"strategy,notnull"`
+	Config     string                                 `sql:"config"`
+	Default    bool                                   `sql:"default,notnull"`
+	Deleted    bool                                   `sql:"deleted,notnull"`
 	sql.AuditLog
 }
 
 type PipelineConfigRepository interface {
 	Save(pipelineStrategy *PipelineStrategy, tx *pg.Tx) error
 	Update(pipelineStrategy *PipelineStrategy, tx *pg.Tx) error
 	FindById(id int) (chart *PipelineStrategy, err error)
-	FindByStrategy(strategy pipelineConfig.DeploymentTemplate) (pipelineStrategy *PipelineStrategy, err error)
-	FindByStrategyAndPipelineId(strategy pipelineConfig.DeploymentTemplate, pipelineId int) (pipelineStrategy *PipelineStrategy, err error)
+	FindByStrategy(strategy chartRepoRepository.DeploymentStrategy) (pipelineStrategy *PipelineStrategy, err error)
+	FindByStrategyAndPipelineId(strategy chartRepoRepository.DeploymentStrategy, pipelineId int) (pipelineStrategy *PipelineStrategy, err error)
 	GetAllStrategyByPipelineId(pipelineId int) ([]*PipelineStrategy, error)
 	GetDefaultStrategyByPipelineId(pipelineId int) (pipelineStrategy *PipelineStrategy, err error)
 	Delete(pipelineStrategy *PipelineStrategy, tx *pg.Tx) error
@@ -70,22 +70,22 @@ func (impl PipelineConfigRepositoryImpl) FindById(id int) (pipelineStrategy *Pip
 	return pipelineStrategy, err
 }
 
-func (impl PipelineConfigRepositoryImpl) FindByStrategy(strategy pipelineConfig.DeploymentTemplate) (pipelineStrategy *PipelineStrategy, err error) {
+func (impl PipelineConfigRepositoryImpl) FindByStrategy(strategy chartRepoRepository.DeploymentStrategy) (pipelineStrategy *PipelineStrategy, err error) {
 	pipelineStrategy = &PipelineStrategy{}
 	err = impl.dbConnection.Model(pipelineStrategy).
 		Where("strategy = ?", strategy).Select()
 	return pipelineStrategy, err
 }
 
-func (impl PipelineConfigRepositoryImpl) FindByStrategyAndPipelineId(strategy pipelineConfig.DeploymentTemplate, pipelineId int) (pipelineStrategy *PipelineStrategy, err error) {
+func (impl PipelineConfigRepositoryImpl) FindByStrategyAndPipelineId(strategy chartRepoRepository.DeploymentStrategy, pipelineId int) (pipelineStrategy *PipelineStrategy, err error) {
 	pipelineStrategy = &PipelineStrategy{}
 	err = impl.dbConnection.Model(pipelineStrategy).
 		Where("strategy = ?", strategy).
 		Where("pipeline_id = ?", pipelineId).Select()
 	return pipelineStrategy, err
 }
 
-//it will return for multiple pipeline config for pipeline, per pipeline single pipeline config(blue green, canary)
+// it will return for multiple pipeline config for pipeline, per pipeline single pipeline config(blue green, canary)
 func (impl PipelineConfigRepositoryImpl) GetAllStrategyByPipelineId(pipelineId int) ([]*PipelineStrategy, error) {
 	var pipelineStrategies []*PipelineStrategy
 	err := impl.dbConnection.
@@ -99,7 +99,7 @@ func (impl PipelineConfigRepositoryImpl) GetAllStrategyByPipelineId(pipelineId i
 	return pipelineStrategies, err
 }
 
-//it will return single latest pipeline config for requested pipeline
+// it will return single latest pipeline config for requested pipeline
 func (impl PipelineConfigRepositoryImpl) GetDefaultStrategyByPipelineId(pipelineId int) (pipelineStrategy *PipelineStrategy, err error) {
 	pipelineStrategy = &PipelineStrategy{}
 	err = impl.dbConnection.

internal/sql/repository/pipelineConfig/PipelineRepository.go

@@ -30,16 +30,10 @@ import (
 
 type PipelineType string
 type TriggerType string //HOW pipeline should be triggered
-type DeploymentTemplate string
 
 const TRIGGER_TYPE_AUTOMATIC TriggerType = "AUTOMATIC"
 const TRIGGER_TYPE_MANUAL TriggerType = "MANUAL"
 
-const DEPLOYMENT_TEMPLATE_BLUE_GREEN DeploymentTemplate = "BLUE-GREEN"
-const DEPLOYMENT_TEMPLATE_ROLLING DeploymentTemplate = "ROLLING"
-const DEPLOYMENT_TEMPLATE_CANARY DeploymentTemplate = "CANARY"
-const DEPLOYMENT_TEMPLATE_RECREATE DeploymentTemplate = "RECREATE"
-
 type Pipeline struct {
 	tableName                     struct{} `sql:"pipeline" pg:",discard_unknown_columns"`
 	Id                            int      `sql:"id,pk"`

internal/util/ChartService.go

@@ -51,7 +51,7 @@ const PIPELINE_DEPLOYMENT_TYPE_ACD string = "argo_cd"
 const PIPELINE_DEPLOYMENT_TYPE_HELM string = "helm"
 
 type ChartTemplateService interface {
-	FetchValuesFromReferenceChart(chartMetaData *chart.Metadata, refChartLocation string, templateName string, userId int32) (*ChartValues, *ChartGitAttribute, error)
+	FetchValuesFromReferenceChart(chartMetaData *chart.Metadata, refChartLocation string, templateName string, userId int32, pipelineStrategyPath string) (*ChartValues, *ChartGitAttribute, error)
 	GetChartVersion(location string) (string, error)
 	CreateChartProxy(chartMetaData *chart.Metadata, refChartLocation string, templateName string, version string, envName string, installAppVersionRequest *appStoreBean.InstallAppVersionDTO) (string, *ChartGitAttribute, error)
 	GitPull(clonedDir string, repoUrl string, appStoreName string) error
@@ -142,7 +142,7 @@ func (impl ChartTemplateServiceImpl) GetChartVersion(location string) (string, e
 	return chartContent.Version, nil
 }
 
-func (impl ChartTemplateServiceImpl) FetchValuesFromReferenceChart(chartMetaData *chart.Metadata, refChartLocation string, templateName string, userId int32) (*ChartValues, *ChartGitAttribute, error) {
+func (impl ChartTemplateServiceImpl) FetchValuesFromReferenceChart(chartMetaData *chart.Metadata, refChartLocation string, templateName string, userId int32, pipelineStrategyPath string) (*ChartValues, *ChartGitAttribute, error) {
 	chartMetaData.ApiVersion = "v1" // ensure always v1
 	dir := impl.GetDir()
 	chartDir := filepath.Join(string(impl.chartWorkingDir), dir)
@@ -165,7 +165,7 @@ func (impl ChartTemplateServiceImpl) FetchValuesFromReferenceChart(chartMetaData
 		impl.logger.Errorw("error in creating archive", "err", err)
 		return nil, nil, err
 	}
-	values, err := impl.getValues(chartDir)
+	values, err := impl.getValues(chartDir, pipelineStrategyPath)
 	if err != nil {
 		impl.logger.Errorw("error in pushing chart", "path", archivePath, "err", err)
 		return nil, nil, err
@@ -312,7 +312,7 @@ func (impl ChartTemplateServiceImpl) pushChartToGitRepo(gitOpsRepoName, referenc
 	return nil
 }
 
-func (impl ChartTemplateServiceImpl) getValues(directory string) (values *ChartValues, err error) {
+func (impl ChartTemplateServiceImpl) getValues(directory, pipelineStrategyPath string) (values *ChartValues, err error) {
 
 	if fi, err := os.Stat(directory); err != nil {
 		return nil, err
@@ -364,17 +364,15 @@ func (impl ChartTemplateServiceImpl) getValues(directory string) (values *ChartV
 					}
 				}
 			}
-			if name == "pipeline-values.yaml" || name == "pipeline-values.yml" {
-				pipelineOverrideByte, err = ioutil.ReadFile(filepath.Clean(filepath.Join(directory, file.Name())))
-				if err != nil {
-					impl.logger.Errorw("failed reading data from file", "err", err)
-				} else {
-					pipelineOverrideByte, err = yaml.YAMLToJSON(pipelineOverrideByte)
-					if err != nil {
-						return nil, err
-					}
-				}
-			}
+		}
+	}
+	pipelineOverrideByte, err = ioutil.ReadFile(filepath.Clean(filepath.Join(directory, pipelineStrategyPath)))
+	if err != nil {
+		impl.logger.Errorw("failed reading data from file", "err", err)
+	} else {
+		pipelineOverrideByte, err = yaml.YAMLToJSON(pipelineOverrideByte)
+		if err != nil {
+			return nil, err
 		}
 	}
 

internal/util/ChartService_test.go

@@ -0,0 +1,22 @@
+package util
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestChartTemplateService(t *testing.T) {
+	t.SkipNow()
+	t.Run("getValues", func(t *testing.T) {
+		logger, err := NewSugardLogger()
+		assert.Nil(t, err)
+		impl := ChartTemplateServiceImpl{
+			logger: logger,
+		}
+		directory := "github.com/devtron-labs/devtron/scripts/devtron-reference-helm-charts"
+		pipelineStrategyPath := "pipeline-values.yaml"
+		values, err := impl.getValues(directory, pipelineStrategyPath)
+		assert.Nil(t, err)
+		assert.Nil(t, values)
+	})
+}