Merge branch 'main' into trace-observability-otlp

Author: kripanshdevtron

.gitbook.yaml

@@ -68,4 +68,4 @@ redirects:
     user-guide/use-cases/connect-springboot-with-mysql-database: resources/use-cases/connect-springboot-with-mysql-database
     user-guide/use-cases/connect-expressjs-with-mongodb-database: resources/use-cases/connect-expressjs-with-mongodb-database
     user-guide/use-cases/connect-django-with-mysql-database: resources/use-cases/connect-django-with-mysql-database
-    user-guide/telemetry: resources/telemetry
+    user-guide/telemetry: resources/telemetry

.github/semantic.yml

@@ -1,12 +1,12 @@
 titleOnly: true
 
 types:
-  - fix:
-  - feat:
-  - feature:
-  - fixes:
-  - chore:
-  - perf:
-  - docs:
-  - doc:
-  - release:
+  - fix
+  - feat
+  - feature
+  - fixes
+  - chore
+  - perf
+  - docs
+  - doc
+  - release

CHANGELOG/release-notes-v0.6.9.md

@@ -0,0 +1,57 @@
+## v0.6.9
+
+## Bugs
+- fix: specific error message if token is invalid while saving cluster (#2760)
+## Enhancements
+- feat: Resource status for integration (#2620)
+- feat: Cluster terminal access for Super Admins (#2654)
+- feat: Dynamic handling of deployment templates (#2596)
+## Documentation
+- docs: description for charts (#2646)
+
+
+## v0.6.9-rc.1
+
+## Bugs
+- fix: Ignoring propagating invalid labels in app to values.yaml during deployment (#2734)
+- fix: app clone response update for empty material and templates (#2717)
+- fix: getting error message on deleting linked ci pipeline (#2732)
+## Enhancements
+- feat: Gitops or helm options for cd (#2673)
+- feat: added BE support for allowing insecure tls connection in gitOps (#2738)
+## Documentation
+- docs: minor updates (#2)
+- docs: webhook updates links (#2716)
+- docs: webhook ci documentation updates (#2637)
+- docs: add getting started doc (#2658)
+- docs: broken links fixed (#2741)
+## Others
+- minor updates (#2722)
+- fix for app type setting (#2723)
+- task: updated environment variables in pre/post cd workflow request (#2727)
+- Revert "feat: added BE support for allowing insecure tls connection in gitOps (#2738)" (#2739)
+- minor updates (#2742)
+
+
+## v0.6.9-rc.0
+
+## Bugs
+- fix: removed required validation for deployment template (#2713)
+- fix: env variable tag bug in ci cd config (#2698)
+- fix: Block deletion of devtronapp(devtron-operator chart)  in helm apps (#2701)
+- fix: migration down sql for 84 (#2706)
+- Fix: Skip external ci webhook clone while app clone (#2704)
+- fix: deployment template editor view support in create app api (#2697)
+- Fix:  External ci webhook response for api token. (#2699)
+- fix: wf deletion bug and bulk cd pipeline req (#2693)
+- fix: updated cluster connection status for update api (#2686)
+## Enhancements
+- Feat: External Ci webhook new interface, Deployment separated from build node. (#2664)
+## Documentation
+- docs: external-links-docs (#2679)
+## Others
+- sql migration error fix (#2695)
+- External links extention for app level  (#2573)
+- added support for giving names in wf bulk deletion req (#2690)
+
+

Wire.go

@@ -43,6 +43,7 @@ import (
 	"github.com/devtron-labs/devtron/api/sse"
 	"github.com/devtron-labs/devtron/api/sso"
 	"github.com/devtron-labs/devtron/api/team"
+	"github.com/devtron-labs/devtron/api/terminal"
 	"github.com/devtron-labs/devtron/api/user"
 	webhookHelm "github.com/devtron-labs/devtron/api/webhook/helm"
 	"github.com/devtron-labs/devtron/client/argocdServer"
@@ -132,6 +133,7 @@ func InitializeApp() (*App, error) {
 		module.ModuleWireSet,
 		apiToken.ApiTokenWireSet,
 		webhookHelm.WebhookHelmWireSet,
+		terminal.TerminalWireSet,
 		// -------wireset end ----------
 		gitSensor.GetGitSensorConfig,
 		gitSensor.NewGitSensorSession,
@@ -747,6 +749,11 @@ func InitializeApp() (*App, error) {
 		cron.NewCdApplicationStatusUpdateHandlerImpl,
 		wire.Bind(new(cron.CdApplicationStatusUpdateHandler), new(*cron.CdApplicationStatusUpdateHandlerImpl)),
 
+		cron.GetCiWorkflowStatusUpdateConfig,
+		cron.NewCiStatusUpdateCronImpl,
+		wire.Bind(new(cron.CiStatusUpdateCron), new(*cron.CiStatusUpdateCronImpl)),
+
+
 		restHandler.NewPipelineStatusTimelineRestHandlerImpl,
 		wire.Bind(new(restHandler.PipelineStatusTimelineRestHandler), new(*restHandler.PipelineStatusTimelineRestHandlerImpl)),
 
@@ -781,6 +788,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/cluster/ClusterRestHandler.go

@@ -51,6 +51,7 @@ type ClusterRestHandler interface {
 
 	FindAllForAutoComplete(w http.ResponseWriter, r *http.Request)
 	DeleteCluster(w http.ResponseWriter, r *http.Request)
+	GetAllClusterNamespaces(w http.ResponseWriter, r *http.Request)
 }
 
 type ClusterRestHandlerImpl struct {
@@ -360,3 +361,18 @@ func (impl ClusterRestHandlerImpl) DeleteCluster(w http.ResponseWriter, r *http.
 	}
 	common.WriteJsonResp(w, err, CLUSTER_DELETE_SUCCESS_RESP, http.StatusOK)
 }
+
+func (impl ClusterRestHandlerImpl) GetAllClusterNamespaces(w http.ResponseWriter, r *http.Request) {
+	token := r.Header.Get("token")
+	clusterNamespaces := impl.clusterService.GetAllClusterNamespaces()
+
+	// RBAC enforcer applying
+	for clusterName, _ := range clusterNamespaces {
+		if ok := impl.enforcer.Enforce(token, casbin.ResourceCluster, casbin.ActionGet, strings.ToLower(clusterName)); !ok {
+			delete(clusterNamespaces, clusterName)
+		}
+	}
+	//RBAC enforcer Ends
+
+	common.WriteJsonResp(w, nil, clusterNamespaces, http.StatusOK)
+}

api/cluster/ClusterRouter.go

@@ -57,6 +57,10 @@ func (impl ClusterRouterImpl) InitClusterRouter(clusterRouter *mux.Router) {
 		Methods("GET").
 		HandlerFunc(impl.clusterRestHandler.FindAllForAutoComplete)
 
+	clusterRouter.Path("/namespaces").
+		Methods("GET").
+		HandlerFunc(impl.clusterRestHandler.GetAllClusterNamespaces)
+
 	clusterRouter.Path("").
 		Methods("DELETE").
 		HandlerFunc(impl.clusterRestHandler.DeleteCluster)

api/helm-app/HelmAppService.go

@@ -37,6 +37,7 @@ const DEFAULT_CLUSTER_ID = 1
 type HelmAppService interface {
 	ListHelmApplications(clusterIds []int, w http.ResponseWriter, token string, helmAuth func(token string, object string) bool)
 	GetApplicationDetail(ctx context.Context, app *AppIdentifier) (*AppDetail, error)
+	GetApplicationDetailWithFilter(ctx context.Context, app *AppIdentifier, resourceTreeFilter *ResourceTreeFilter) (*AppDetail, error)
 	HibernateApplication(ctx context.Context, app *AppIdentifier, hibernateRequest *openapi.HibernateRequest) ([]*openapi.HibernateStatus, error)
 	UnHibernateApplication(ctx context.Context, app *AppIdentifier, hibernateRequest *openapi.HibernateRequest) ([]*openapi.HibernateStatus, error)
 	DecodeAppId(appId string) (*AppIdentifier, error)
@@ -233,15 +234,24 @@ func (impl *HelmAppServiceImpl) GetClusterConf(clusterId int) (*ClusterConfig, e
 }
 
 func (impl *HelmAppServiceImpl) GetApplicationDetail(ctx context.Context, app *AppIdentifier) (*AppDetail, error) {
+	return impl.getApplicationDetail(ctx, app, nil)
+}
+
+func (impl *HelmAppServiceImpl) GetApplicationDetailWithFilter(ctx context.Context, app *AppIdentifier, resourceTreeFilter *ResourceTreeFilter) (*AppDetail, error) {
+	return impl.getApplicationDetail(ctx, app, resourceTreeFilter)
+}
+
+func (impl *HelmAppServiceImpl) getApplicationDetail(ctx context.Context, app *AppIdentifier, resourceTreeFilter *ResourceTreeFilter) (*AppDetail, error) {
 	config, err := impl.GetClusterConf(app.ClusterId)
 	if err != nil {
 		impl.logger.Errorw("error in fetching cluster detail", "err", err)
 		return nil, err
 	}
 	req := &AppDetailRequest{
-		ClusterConfig: config,
-		Namespace:     app.Namespace,
-		ReleaseName:   app.ReleaseName,
+		ClusterConfig:      config,
+		Namespace:          app.Namespace,
+		ReleaseName:        app.ReleaseName,
+		ResourceTreeFilter: resourceTreeFilter,
 	}
 	appdetail, err := impl.helmAppClient.GetAppDetail(ctx, req)
 	if err != nil {
@@ -265,7 +275,6 @@ func (impl *HelmAppServiceImpl) GetApplicationDetail(ctx context.Context, app *A
 		}
 	}
 	return appdetail, err
-
 }
 
 func (impl *HelmAppServiceImpl) GetDeploymentHistory(ctx context.Context, app *AppIdentifier) (*HelmAppDeploymentHistory, error) {