devtron-labs
diff --git a/‎CHANGELOG/release-notes-v0.6.11.md‎
Lines changed: 47 additions & 0 deletions b/‎CHANGELOG/release-notes-v0.6.11.md‎
Lines changed: 47 additions & 0 deletions
diff --git a/‎Dockerfile‎
Lines changed: 1 addition & 1 deletion b/‎Dockerfile‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎DockerfileEA‎
Lines changed: 1 addition & 1 deletion b/‎DockerfileEA‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Wire.go‎
Lines changed: 9 additions & 0 deletions b/‎Wire.go‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎api/appStore/InstalledAppRestHandler.go‎
Lines changed: 15 additions & 1 deletion b/‎api/appStore/InstalledAppRestHandler.go‎
Lines changed: 15 additions & 1 deletion
diff --git a/‎api/bean/AppView.go‎
Lines changed: 2 additions & 0 deletions b/‎api/bean/AppView.go‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎api/helm-app/openapiClient/model_helm_app.go‎
Lines changed: 46 additions & 4 deletions b/‎api/helm-app/openapiClient/model_helm_app.go‎
Lines changed: 46 additions & 4 deletions
diff --git a/‎api/restHandler/AppListingRestHandler.go‎
Lines changed: 11 additions & 1 deletion b/‎api/restHandler/AppListingRestHandler.go‎
Lines changed: 11 additions & 1 deletion
diff --git a/‎api/restHandler/app/DeploymentPipelineRestHandler.go‎
Lines changed: 35 additions & 0 deletions b/‎api/restHandler/app/DeploymentPipelineRestHandler.go‎
Lines changed: 35 additions & 0 deletions
diff --git a/‎api/router/PipelineConfigRouter.go‎
Lines changed: 1 addition & 0 deletions b/‎api/router/PipelineConfigRouter.go‎
Lines changed: 1 addition & 0 deletions
@@ -0,0 +1,47 @@
+## v0.6.11
+
+## Bugs
+- fix: Nats server version upgrade (#2837)
+- fix: K8s side resources error handled some unable to fetch some kinds in cluster (#2896)
+- fix: helm and gitOps pipeline feature gap changes (#2891)
+- fix: Adding /Deleting git material reflection in workflow editor and build & deploy (#2744)
+- fix: issue resolved for notification on deployment trigger and telemetry summary event (#2893)
+- fix: helm manifest output in deployment history (#2822)
+- fix: sending appName in the response of getAppWorkflow API (#2879)
+- fix: cluster not reachable handling (#2872)
+## Enhancements
+- feat: Support of reuse container image in containers section in reference chart 4-17 (#2675)
+- feat: Added Rollout chart 4.17 and Deployment chart 1.1 with canary using flagger and Istio support (#2910)
+- feat: Codacy plugin integration (#2892)
+- feat: Semgrep plugin integration (#2877)
+- perf: Tracing observability tool integration (#2782)
+## Documentation
+- docs: removed command to install a particular version of Devtron (#2888)
+- docs: Updated README.md file for Devtron chart (#2887)
+- docs: added manage tags (#2907)
+- docs: updated target platform (#2857)
+## Others
+- task: added new fields for eso secrets (#2899)
+- task: updated deployment status timeline api for helm based pipelines (#2897)
+- task: updated logic for adding health status timeline (#2870)
+
+
+## v0.6.11-rc.0
+
+## Bugs
+- fix: bitbucket gitops config fixes (#2768)
+- fix: updated sonarqube plugin script (#2855)
+- fix: updated the description in sonarqube migration (#2853)
+- fix: External Ci Trigger - Won't show images for manual Cd pipelines (#2802)
+- fix: app create api bug fix if chart ref is different (#2851)
+- fix: Dockerfile git repo delete tooltip view to build config (#2792)
+## Enhancements
+- feat: Option for changing project in Helm apps and project assignment to CLI helm apps. (#2780)
+- feat: Audit logs for resource deletion from devtron UI  (#2791)
+- feat: verify token function scope made public (#2856)
+- feat: Sonarqube polling script update (#2846)
+- feat: deployment status restructuring (#2825)
+## Documentation
+- docs: updated aws external secret doc (#2781)
+- docs: updated broken links and minor updates (resource browser) (#2844)
+- docs: added cluster, k8s resource browser, k8s resource permission (#2787)
@@ -1,4 +1,4 @@
-FROM golang:1.18  AS build-env
+FROM golang:1.19  AS build-env
 
 RUN echo $GOPATH
 RUN apt update
 
@@ -1,4 +1,4 @@
-FROM golang:1.18  AS build-env
+FROM golang:1.19  AS build-env
 
 RUN echo $GOPATH
 RUN apt update
 
@@ -62,6 +62,7 @@ import (
 	"github.com/devtron-labs/devtron/client/telemetry"
 	"github.com/devtron-labs/devtron/internal/sql/repository"
 	app2 "github.com/devtron-labs/devtron/internal/sql/repository/app"
+	appStatusRepo "github.com/devtron-labs/devtron/internal/sql/repository/appStatus"
 	appWorkflow2 "github.com/devtron-labs/devtron/internal/sql/repository/appWorkflow"
 	"github.com/devtron-labs/devtron/internal/sql/repository/bulkUpdate"
 	"github.com/devtron-labs/devtron/internal/sql/repository/chartConfig"
@@ -74,6 +75,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/app"
 	"github.com/devtron-labs/devtron/pkg/appClone"
 	"github.com/devtron-labs/devtron/pkg/appClone/batch"
+	"github.com/devtron-labs/devtron/pkg/appStatus"
 	appStoreBean "github.com/devtron-labs/devtron/pkg/appStore/bean"
 	appStoreDeploymentFullMode "github.com/devtron-labs/devtron/pkg/appStore/deployment/fullMode"
 	repository4 "github.com/devtron-labs/devtron/pkg/appStore/deployment/repository"
@@ -751,6 +753,13 @@ func InitializeApp() (*App, error) {
 		cron.NewCdApplicationStatusUpdateHandlerImpl,
 		wire.Bind(new(cron.CdApplicationStatusUpdateHandler), new(*cron.CdApplicationStatusUpdateHandlerImpl)),
 
+		//app_status
+		appStatusRepo.NewAppStatusRepositoryImpl,
+		wire.Bind(new(appStatusRepo.AppStatusRepository), new(*appStatusRepo.AppStatusRepositoryImpl)),
+		appStatus.NewAppStatusServiceImpl,
+		wire.Bind(new(appStatus.AppStatusService), new(*appStatus.AppStatusServiceImpl)),
+		//app_status ends
+
 		cron.GetCiWorkflowStatusUpdateConfig,
 		cron.NewCiStatusUpdateCronImpl,
 		wire.Bind(new(cron.CiStatusUpdateCron), new(*cron.CiStatusUpdateCronImpl)),
 
@@ -143,6 +143,12 @@ func (handler InstalledAppRestHandlerImpl) GetAllInstalledApp(w http.ResponseWri
 			}
 		}
 	}
+
+	var appStatuses []string
+	appStatusesStr := v.Get("appStatuses")
+	if len(appStatusesStr) > 0 {
+		appStatuses = strings.Split(appStatusesStr, ",")
+	}
 	appStoreName := v.Get("appStoreName")
 	appName := v.Get("appName")
 	offset := 0
@@ -155,7 +161,15 @@ func (handler InstalledAppRestHandlerImpl) GetAllInstalledApp(w http.ResponseWri
 	if len(sizeStr) > 0 {
 		size, _ = strconv.Atoi(sizeStr)
 	}
-	filter := &appStoreBean.AppStoreFilter{OnlyDeprecated: onlyDeprecated, ChartRepoId: chartRepoIds, AppStoreName: appStoreName, EnvIds: envIds, AppName: appName, ClusterIds: clusterIds}
+	filter := &appStoreBean.AppStoreFilter{
+		OnlyDeprecated: onlyDeprecated,
+		ChartRepoId:    chartRepoIds,
+		AppStoreName:   appStoreName,
+		EnvIds:         envIds,
+		AppName:        appName,
+		ClusterIds:     clusterIds,
+		AppStatuses:    appStatuses,
+	}
 	if size > 0 {
 		filter.Size = size
 		filter.Offset = offset
 
@@ -62,6 +62,7 @@ type AppEnvironmentContainer struct {
 	DeploymentCounter           int                       `json:"deploymentCounter,omitempty"`
 	InstanceCounter             int                       `json:"instanceCounter,omitempty"`
 	Status                      string                    `json:"status"`
+	AppStatus                   string                    `json:"appStatus"`
 	CdStageStatus               *string                   `json:"cdStageStatus"`
 	PreStageStatus              *string                   `json:"preStageStatus"`
 	PostStageStatus             *string                   `json:"postStageStatus"`
@@ -123,6 +124,7 @@ type AppDetailContainer struct {
 }
 
 type Environment struct {
+	AppStatus       string `json:"appStatus"` //this is not the status of environment , this make sense with a specific app only
 	EnvironmentId   int    `json:"environmentId"`
 	EnvironmentName string `json:"environmentName"`
 	AppMetrics      *bool  `json:"appMetrics"`
 
@@ -33,6 +33,7 @@ import (
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
 	"github.com/devtron-labs/devtron/internal/util"
 	"github.com/devtron-labs/devtron/pkg/app"
+	"github.com/devtron-labs/devtron/pkg/appStatus"
 	service1 "github.com/devtron-labs/devtron/pkg/appStore/deployment/service"
 	"github.com/devtron-labs/devtron/pkg/cluster"
 	"github.com/devtron-labs/devtron/pkg/deploymentGroup"
@@ -85,6 +86,7 @@ type AppListingRestHandlerImpl struct {
 	installedAppService              service1.InstalledAppService
 	cdApplicationStatusUpdateHandler cron.CdApplicationStatusUpdateHandler
 	pipelineRepository               pipelineConfig.PipelineRepository
+	appStatusService                 appStatus.AppStatusService
 }
 
 type AppStatus struct {
@@ -105,7 +107,8 @@ func NewAppListingRestHandlerImpl(application application.ServiceClient,
 	helmAppClient client.HelmAppClient, clusterService cluster.ClusterService, helmAppService client.HelmAppService,
 	argoUserService argo.ArgoUserService, k8sApplicationService k8s.K8sApplicationService, installedAppService service1.InstalledAppService,
 	cdApplicationStatusUpdateHandler cron.CdApplicationStatusUpdateHandler,
-	pipelineRepository pipelineConfig.PipelineRepository) *AppListingRestHandlerImpl {
+	pipelineRepository pipelineConfig.PipelineRepository,
+	appStatusService appStatus.AppStatusService) *AppListingRestHandlerImpl {
 	appListingHandler := &AppListingRestHandlerImpl{
 		application:                      application,
 		appListingService:                appListingService,
@@ -124,6 +127,7 @@ func NewAppListingRestHandlerImpl(application application.ServiceClient,
 		installedAppService:              installedAppService,
 		cdApplicationStatusUpdateHandler: cdApplicationStatusUpdateHandler,
 		pipelineRepository:               pipelineRepository,
+		appStatusService:                 appStatusService,
 	}
 	return appListingHandler
 }
@@ -806,6 +810,12 @@ func (handler AppListingRestHandlerImpl) fetchResourceTree(w http.ResponseWriter
 				handler.logger.Errorw("error in syncing pipeline status", "err", err)
 			}
 		}
+		//updating app_status table here
+		err = handler.appStatusService.UpdateStatusWithAppIdEnvId(appDetail.AppId, appDetail.EnvironmentId, resp.Status)
+		if err != nil {
+			handler.logger.Warnw("error in updating app status", "err", err, "appId", appDetail.AppId, "envId", appDetail.EnvironmentId)
+		}
+
 	} else if len(appDetail.AppName) > 0 && len(appDetail.EnvironmentName) > 0 && util.IsHelmApp(appDetail.DeploymentAppType) {
 		config, err := handler.helmAppService.GetClusterConf(appDetail.ClusterId)
 		if err != nil {
 
@@ -40,6 +40,7 @@ type DevtronAppDeploymentRestHandler interface {
 type DevtronAppDeploymentConfigRestHandler interface {
 	ConfigureDeploymentTemplateForApp(w http.ResponseWriter, r *http.Request)
 	GetDeploymentTemplate(w http.ResponseWriter, r *http.Request)
+	GetDefaultDeploymentTemplate(w http.ResponseWriter, r *http.Request)
 	GetAppOverrideForDefaultTemplate(w http.ResponseWriter, r *http.Request)
 
 	EnvConfigOverrideCreate(w http.ResponseWriter, r *http.Request)
@@ -588,6 +589,40 @@ func (handler PipelineConfigRestHandlerImpl) GetDeploymentTemplate(w http.Respon
 	common.WriteJsonResp(w, nil, appConfigResponse, http.StatusOK)
 }
 
+func (handler *PipelineConfigRestHandlerImpl) GetDefaultDeploymentTemplate(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	appId, err := strconv.Atoi(vars["appId"])
+	if err != nil {
+		handler.Logger.Error("error in getting appId path param, GetDefaultDeploymentTemplate", "err", err)
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+	chartRefId, err := strconv.Atoi(vars["chartRefId"])
+	if err != nil {
+		handler.Logger.Error("error in getting chartRefId path param, GetDefaultDeploymentTemplate", "err", err)
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+	token := r.Header.Get("token")
+	app, err := handler.pipelineBuilder.GetApp(appId)
+	if err != nil {
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+	obj := handler.enforcerUtil.GetAppRBACName(app.AppName)
+	if ok := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionGet, obj); !ok {
+		common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "unauthorized user", http.StatusForbidden)
+		return
+	}
+	defaultTemplate, err := handler.chartService.GetAppOverrideForDefaultTemplate(chartRefId)
+	if err != nil {
+		handler.Logger.Errorw("error in getting default deployment template, GetDefaultDeploymentTemplate", "err", err, "appId", appId, "chartRefId", chartRefId)
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
+	}
+	common.WriteJsonResp(w, nil, defaultTemplate, http.StatusOK)
+}
+
 func (handler PipelineConfigRestHandlerImpl) GetCdPipelines(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	appId, err := strconv.Atoi(vars["appId"])
 
@@ -63,6 +63,7 @@ func (router PipelineConfigRouterImpl) initPipelineConfigRouter(configRouter *mu
 
 	configRouter.Path("/template").HandlerFunc(router.restHandler.ConfigureDeploymentTemplateForApp).Methods("POST")
 	configRouter.Path("/template/{appId}/{chartRefId}").HandlerFunc(router.restHandler.GetDeploymentTemplate).Methods("GET")
+	configRouter.Path("/template/default/{appId}/{chartRefId}").HandlerFunc(router.restHandler.GetDefaultDeploymentTemplate).Methods("GET")
 	configRouter.Path("/template/update").HandlerFunc(router.restHandler.UpdateAppOverride).Methods("POST")
 
 	configRouter.Path("/cd-pipeline").HandlerFunc(router.restHandler.CreateCdPipeline).Methods("POST")
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.18 AS build-env`
	`1`	`+FROM golang:1.19 AS build-env`
`2`	`2`
`3`	`3`	`RUN echo $GOPATH`
`4`	`4`	`RUN apt update`