Merge branch 'main' into updating-pr-validator

Author: prakarsh-dt

App.go

@@ -35,6 +35,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/auth/user"
 
 	"github.com/casbin/casbin"
+	casbinv2 "github.com/casbin/casbin/v2"
 	authMiddleware "github.com/devtron-labs/authenticator/middleware"
 	"github.com/devtron-labs/devtron/api/router"
 	"github.com/devtron-labs/devtron/api/sse"
@@ -50,6 +51,7 @@ type App struct {
 	Logger                *zap.SugaredLogger
 	SSE                   *sse.SSE
 	Enforcer              *casbin.SyncedEnforcer
+	EnforcerV2            *casbinv2.SyncedEnforcer
 	server                *http.Server
 	db                    *pg.DB
 	posthogClient         *telemetry.PosthogClient
@@ -74,6 +76,7 @@ func NewApp(router *router.MuxRouter,
 	centralEventProcessor *eventProcessor.CentralEventProcessor,
 	pubSubClient *pubsub.PubSubClientServiceImpl,
 	workflowEventProcessorImpl *in.WorkflowEventProcessorImpl,
+	enforcerV2 *casbinv2.SyncedEnforcer,
 ) *App {
 	//check argo connection
 	//todo - check argo-cd version on acd integration installation
@@ -82,6 +85,7 @@ func NewApp(router *router.MuxRouter,
 		Logger:                     Logger,
 		SSE:                        sse,
 		Enforcer:                   enforcer,
+		EnforcerV2:            enforcerV2,
 		db:                         db,
 		serveTls:                   false,
 		sessionManager2:            sessionManager2,

api/auth/user/wire_user.go

@@ -56,7 +56,7 @@ var UserWireSet = wire.NewSet(
 
 	casbin.NewEnforcerImpl,
 	wire.Bind(new(casbin.Enforcer), new(*casbin.EnforcerImpl)),
-	casbin.Create,
+	casbin.Create, casbin.CreateV2,
 
 	user2.NewUserCommonServiceImpl,
 	wire.Bind(new(user2.UserCommonService), new(*user2.UserCommonServiceImpl)),

cmd/external-app/wire_gen.go

@@ -39,17 +39,19 @@
     * [Permission Groups](user-guide/global-configurations/authorization/permission-groups.md)
     * [API Tokens](user-guide/global-configurations/authorization/api-tokens.md)
   * [Notifications](user-guide/global-configurations/manage-notification.md)
+  * [Deployment Window](user-guide/global-configurations/deployment-window.md)
   * [External Links](user-guide/global-configurations/external-links.md)
   * [Catalog Framework](user-guide/global-configurations/catalog-framework.md)
   * [Scoped Variables](user-guide/global-configurations/scoped-variables.md)
   * [Pull Image Digest](user-guide/global-configurations/pull-image-digest.md)
   * [Tags Policy](user-guide/global-configurations/tags-policy.md)
+  * [Filter Condition](user-guide/global-configurations/filter-condition.md)
   * [Lock Deployment Configuration](user-guide/global-configurations/lock-deployment-config.md)
   * [Image Promotion Policy](user-guide/global-configurations/image-promotion-policy.md)  
-  * [Filter Condition](user-guide/global-configurations/filter-condition.md)
   * [Build Infra](user-guide/global-configurations/build-infra.md)
 * [Devtron Upgrade](setup/upgrade/README.md)
   * [Update Devtron from Devtron UI](setup/upgrade/upgrade-devtron-ui.md)
+  * [0.6.x-0.7.x](setup/upgrade/devtron-upgrade-0.6.x-0.7.x.md)
   * [0.5.x-0.6.x](setup/upgrade/devtron-upgrade-0.5.x-0.6.x.md)
   * [0.4.x-0.5.x](setup/upgrade/devtron-upgrade-0.4.x-0.5.x.md)
   * [0.4.x-0.4.x](setup/upgrade/devtron-upgrade-0.4.x-0.4.x.md)

docs/SUMMARY.md

@@ -6,6 +6,7 @@ Devtron can be upgraded in one of the following ways:
 
 **Versions Upgrade**
 
+- [0.6.x to 0.7.x](devtron-upgrade-0.6.x-0.7.x.md)
 - [0.5.x to 0.6.x](devtron-upgrade-0.5.x-0.6.x.md)
 - [0.4.x to 0.5.x](devtron-upgrade-0.4.x-0.5.x.md)
 - [0.4.x to 0.4.x](devtron-upgrade-0.4.x-0.4.x.md)

docs/setup/upgrade/README.md

@@ -0,0 +1,55 @@
+# Upgrading Devtron 0.6.x to 0.7.x
+
+To check the current version of your Devtron setup, use the following command
+
+```bash
+kubectl -n devtroncd get installers installer-devtron -o jsonpath='{.status.sync.data}' | grep "^LTAG=" | cut -d"=" -f2-
+```
+
+Proceed with the following steps only if the version is `0.6.x`
+
+---
+
+## Prerequisites
+
+1. Set the release name
+
+```bash
+export RELEASE_NAME=devtron
+```
+
+2. Label and annotate the service accounts in the `devtron-ci` namespace
+
+```bash
+kubectl -n devtron-ci label sa --all "app.kubernetes.io/managed-by=Helm" --overwrite
+kubectl -n devtron-ci annotate sa --all "meta.helm.sh/release-name=$RELEASE_NAME" "meta.helm.sh/release-namespace=devtroncd" --overwrite
+```
+
+3. Now, label and annotate the service accounts in the `devtron-cd` namespace
+
+```
+kubectl -n devtron-cd label sa --all "app.kubernetes.io/managed-by=Helm" --overwrite
+kubectl -n devtron-cd annotate sa --all "meta.helm.sh/release-name=$RELEASE_NAME" "meta.helm.sh/release-namespace=devtroncd" --overwrite
+```
+
+---
+
+## Upgrade Commands
+
+1. Update the Helm repository
+
+```bash
+helm repo update
+```
+
+2. Run the upgrade command for Devtron
+
+```bash
+helm upgrade devtron devtron/devtron-operator -n devtroncd --reuse-values -f https://raw.githubusercontent.com/devtron-labs/devtron/main/charts/devtron/devtron-bom.yaml
+```
+
+---
+
+## Expected Command Output
+
+![Command Output](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/kubernetes-resource-browser/command-output.jpg)