Merge branch 'develop' into user-attribute-patch-fix

# Conflicts:
#	env_gen.json

Author: prakash100198

CHANGELOG/release-notes-v1.7.0.md

@@ -0,0 +1,33 @@
+## v1.7.0
+
+## Enhancements
+- feat: Added Cronjob chart 1-6-0 (#6650)
+- feat: wf logs (#6606)
+- feat: Enable selection of all CI pipelines at once when the Environment filter is applied in Notifications (#6526)
+## Bugs
+- fix: app workflow cd pipleine check (#6658)
+- fix: panic fixes on concurrent delete request (#6657)
+- fix: panic fix on concurrent deletion request (#6644)
+- fix: duplicate entries in deployment history without override (#6637)
+- fix: overriden pipeline ids filtering in case of material deletion (#6636)
+- fix: prevent deletion of git material used in overridden CI templates (#6633)
+- fix: ea mode fixes (#6624)
+- fix: stack Manager issues (#6619)
+- fix: Change ci to webhook fix (#6626)
+- fix: oci chart deployment values.yaml and requirement.yaml not compatible (#6620)
+- fix: panic fix installedApp type timeline update (#6614)
+- fix: workflow getting incorrectly deleted in case of webhook and unreachable cluster's cd pipeline (#6602)
+- fix: add safety checks to prevent index-out-of-range panics in CdHandler (#6597)
+- fix: reverted telemetry connection error (#6587)
+- fix: anomalies in deployment status timeline (#6569)
+- fix: scoped var complex type resolution not working in patch type overrides (#6572)
+## Others
+- chore: when a cluster event occurs, create config map instead of secret (#6607)
+- chore: Gpu workload chart (#6608)
+- misc: update sample dockerfiles use non-root user (UID 2002) and base images (#6512)
+- misc: wire in EA (#6616)
+- chore: removed multi-arch section from readme (#6613)
+- chore: git sensor grpc lb policy change (#6610)
+- misc: go routines wrapped into panic safe function (#6589)
+- chore: http transport service refactoring (#6592)
+- misc: GetConfigDBObj in tx (#6584)

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) {