Merge remote-tracking branch 'origin/develop' into fix/buildx-liveness-dailer

Author: Ash-exp

Makefile

@@ -2,7 +2,7 @@
 
 all: fetch-all-env build
 
-TARGET_BRANCH?=main
+TARGET_BRANCH?=develop
 TAG?=$(shell bash -c 'git log --pretty=format:'%h' -n 1')
 FLAGS=
 ENVVAR=

Wire.go

@@ -93,6 +93,7 @@ import (
 	"github.com/devtron-labs/devtron/client/cron"
 	"github.com/devtron-labs/devtron/client/dashboard"
 	eClient "github.com/devtron-labs/devtron/client/events"
+	"github.com/devtron-labs/devtron/client/fluxcd"
 	"github.com/devtron-labs/devtron/client/gitSensor"
 	"github.com/devtron-labs/devtron/client/grafana"
 	"github.com/devtron-labs/devtron/client/lens"
@@ -223,6 +224,7 @@ func InitializeApp() (*App, error) {
 		policyGovernance.PolicyGovernanceWireSet,
 		resourceScan.ScanningResultWireSet,
 		executor.ExecutorWireSet,
+		fluxcd.DeploymentWireSet,
 		// -------wireset end ----------
 		// -------
 		gitSensor.GetConfig,
@@ -754,6 +756,10 @@ func InitializeApp() (*App, error) {
 
 		deployment3.NewFullModeDeploymentServiceImpl,
 		wire.Bind(new(deployment3.FullModeDeploymentService), new(*deployment3.FullModeDeploymentServiceImpl)),
+
+		deployment3.NewFullModeFluxDeploymentServiceImpl,
+		wire.Bind(new(deployment3.FullModeFluxDeploymentService), new(*deployment3.FullModeFluxDeploymentServiceImpl)),
+
 		//	util2.NewGoJsonSchemaCustomFormatChecker,
 
 		//history starts

api/cluster/ClusterRestHandler.go

@@ -556,7 +556,7 @@ func (impl ClusterRestHandlerImpl) DeleteCluster(w http.ResponseWriter, r *http.
 		common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
 		return
 	}
-	var bean bean2.ClusterBean
+	var bean bean2.DeleteClusterBean
 	err = decoder.Decode(&bean)
 	if err != nil {
 		impl.logger.Errorw("request err, Delete", "error", err, "payload", bean)
@@ -580,7 +580,7 @@ func (impl ClusterRestHandlerImpl) DeleteCluster(w http.ResponseWriter, r *http.
 	//RBAC enforcer Ends
 	err = impl.deleteService.DeleteCluster(&bean, userId)
 	if err != nil {
-		impl.logger.Errorw("error in deleting cluster", "err", err, "id", bean.Id, "name", bean.ClusterName)
+		impl.logger.Errorw("error in deleting cluster", "err", err, "id", bean.Id)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}

api/fluxApplication/FluxApplicationRestHandler.go

@@ -45,6 +45,8 @@ func (handler *FluxApplicationRestHandlerImpl) ListFluxApplications(w http.Respo
 	var clusterIds []int
 	var err error
 
+	noStream := v.Get("noStream") == "true"
+
 	//handling when the clusterIds string is empty ,it will not support the
 	if len(clusterIdString) == 0 {
 		handler.logger.Errorw("error in getting cluster ids", "error", err, "clusterIds", clusterIds)
@@ -57,7 +59,7 @@ func (handler *FluxApplicationRestHandlerImpl) ListFluxApplications(w http.Respo
 		return
 	}
 	handler.logger.Debugw("extracted ClusterIds successfully ", "clusterIds", clusterIds)
-	handler.fluxApplicationService.ListFluxApplications(r.Context(), clusterIds, w)
+	handler.fluxApplicationService.ListFluxApplications(r.Context(), clusterIds, noStream, w)
 }
 
 func (handler *FluxApplicationRestHandlerImpl) GetApplicationDetail(w http.ResponseWriter, r *http.Request) {

api/helm-app/gRPC/applist.pb.go

@@ -86,6 +86,8 @@ message FluxAppDetail{
   FluxApplication fluxApplication=1;
   FluxAppStatusDetail FluxAppStatusDetail = 2;
   ResourceTreeResponse resourceTreeResponse =3;
+  string applicationStatus = 4;
+  string lastObservedGeneration = 5;
 }
 
 message FluxAppStatusDetail{

api/helm-app/gRPC/applist.proto

@@ -625,8 +625,10 @@ func (handler *PipelineConfigRestHandlerImpl) validateCiTriggerRBAC(token string
 	appObject := handler.enforcerUtil.GetAppRBACNameByAppId(ciPipeline.AppId)
 	workflowObject := handler.enforcerUtil.GetWorkflowRBACByCiPipelineId(ciPipelineId, workflowName)
 	triggerObject := handler.enforcerUtil.GetTeamEnvRBACNameByCiPipelineIdAndEnvIdOrName(ciPipelineId, triggerEnvironmentId, envName)
-	appRbacOk := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionTrigger, appObject)
-	if !appRbacOk {
+	var appRbacOk bool
+	if ciPipeline.App.AppType == helper.CustomApp {
+		appRbacOk = handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionTrigger, appObject)
+	} else if ciPipeline.App.AppType == helper.Job {
 		appRbacOk = handler.enforcer.Enforce(token, casbin.ResourceJobs, casbin.ActionTrigger, appObject) && handler.enforcer.Enforce(token, casbin.ResourceWorkflow, casbin.ActionTrigger, workflowObject) && handler.enforcer.Enforce(token, casbin.ResourceJobsEnv, casbin.ActionTrigger, triggerObject)
 	}
 

api/restHandler/app/pipeline/configure/BuildPipelineRestHandler.go

@@ -2472,6 +2472,11 @@ func (handler *PipelineConfigRestHandlerImpl) ValidateExternalAppLinkRequest(w h
 		common.WriteJsonResp(w, err, response, http.StatusOK)
 		return
 		// handle helm deployment types
+	} else if request.DeploymentAppType == util.PIPELINE_DEPLOYMENT_TYPE_FLUX {
+		response := handler.pipelineBuilder.ValidateLinkFluxAppRequest(ctx, &request)
+		common.WriteJsonResp(w, err, response, http.StatusOK)
+		return
+		// handle helm deployment types
 	}
 	common.WriteJsonResp(w, errors.New("invalid deployment app type in request"), nil, http.StatusBadRequest)
 	return

api/restHandler/app/pipeline/configure/DeploymentPipelineRestHandler.go

@@ -115,6 +115,11 @@ func NewCdApplicationStatusUpdateHandlerImpl(logger *zap.SugaredLogger, appServi
 		logger.Errorw("error in starting argo application status update cron job", "err", err)
 		return nil
 	}
+	_, err = cron.AddFunc("@every 1m", impl.FluxApplicationStatusUpdate)
+	if err != nil {
+		logger.Errorw("error in starting argo application status update cron job", "err", err)
+		return nil
+	}
 	return impl
 }
 
@@ -137,6 +142,30 @@ func (impl *CdApplicationStatusUpdateHandlerImpl) HelmApplicationStatusUpdate()
 	return
 }
 
+func (impl *CdApplicationStatusUpdateHandlerImpl) FluxApplicationStatusUpdate() {
+	cronProcessStartTime := time.Now()
+	defer func() {
+		middleware.DeploymentStatusCronDuration.WithLabelValues(pipeline.DEVTRON_APP_FLUX_PIPELINE_STATUS_UPDATE_CRON).Observe(time.Since(cronProcessStartTime).Seconds())
+	}()
+	getPipelineDeployedWithinHours := impl.AppStatusConfig.GetPipelineDeployedWithinHours
+	FluxCDPipelineStatusCheckEligibleTime, err := strconv.Atoi(impl.AppStatusConfig.FluxCDPipelineStatusCheckEligibleTime)
+	if err != nil {
+		impl.logger.Errorw("error in converting string to int", "err", err)
+		return
+	}
+	cdPipelineTimeoutDuration, err := strconv.Atoi(impl.AppStatusConfig.CdPipelineStatusTimeoutDuration)
+	if err != nil {
+		impl.logger.Errorw("error in converting string to int", "err", err)
+		return
+	}
+	err = impl.workflowStatusService.CheckFluxAppStatusPeriodicallyAndUpdateInDb(FluxCDPipelineStatusCheckEligibleTime, getPipelineDeployedWithinHours, cdPipelineTimeoutDuration)
+	if err != nil {
+		impl.logger.Errorw("error helm app status update - cron job", "err", err)
+		return
+	}
+	return
+}
+
 func (impl *CdApplicationStatusUpdateHandlerImpl) ArgoApplicationStatusUpdate() {
 	cronProcessStartTime := time.Now()
 	defer func() {