Merge branch 'main' into airgapped-docs

Author: badal773

.gitbook.yaml

@@ -31,6 +31,23 @@ redirects:
     setup/global-configurations/authorization/permission-groups: user-guide/global-configurations/authorization/permission-groups.md
     setup/global-configurations/authorization/api-tokens: user-guide/global-configurations/authorization/api-tokens.md
     setup/global-configurations/nodejs_app: user-guide/Deploy-sample-app/nodejs_app.md
+    setup/global-configurations/host-url: user-guide/global-configurations/host-url.md
+    setup/global-configurations/authorization/sso/google: user-guide/global-configurations/authorization/sso/google.md
+    setup/global-configurations/authorization/sso/github: user-guide/global-configurations/authorization/sso/github.md
+    setup/global-configurations/authorization/sso/gitlab: user-guide/global-configurations/authorization/sso/gitlab.md
+    setup/global-configurations/authorization/sso/microsoft: user-guide/global-configurations/authorization/sso/microsoft.md
+    setup/global-configurations/authorization/sso/ldap: user-guide/global-configurations/authorization/sso/ldap.md
+    setup/global-configurations/authorization/sso/oidc: user-guide/global-configurations/authorization/sso/oidc.md
+    setup/global-configurations/authorization/sso/openshift: user-guide/global-configurations/authorization/sso/openshift.md
+    setup/global-configurations/okta: user-guide/global-configurations/okta.md
+    setup/global-configurations/catalog-framework: user-guide/global-configurations/catalog-framework.md
+    setup/global-configurations/scoped-variables: user-guide/global-configurations/scoped-variables.md
+    setup/global-configurations/pull-image-digest: user-guide/global-configurations/pull-image-digest.md
+    setup/global-configurations/tags-policy: user-guide/global-configurations/tags-policy.md
+    setup/global-configurations/lock-deployment-config: user-guide/global-configurations/lock-deployment-config.md
+    setup/global-configurations/image-promotion-policy: user-guide/global-configurations/image-promotion-policy.md
+    setup/global-configurations/filter-condition: user-guide/global-configurations/filter-condition.md
+    setup/global-configurations/build-infra: user-guide/global-configurations/build-infra.md
     user-guide/creating-application: user-guide/applications.md
     user-guide/creating-application/git-material: usage/applications/creating-application/git-material
     user-guide/creating-application/docker-build-configuration: usage/applications/creating-application/docker-build-configuration
@@ -69,12 +86,45 @@ redirects:
     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
+    getting-started/install/installation-configuration: setup/install/installation-configuration.md
+    getting-started/global-configurations: user-guide/global-configurations/README.md
     getting-started/global-configurations/container-registries: user-guide/global-configurations/container-registries.md
     getting-started/global-configurations/sso-login: user-guide/global-configurations/sso-login.md
     getting-started/global-configurations/docker-registries: user-guide/global-configurations/container-registries.md
+    getting-started/global-configurations/host-url: user-guide/global-configurations/host-url.md
+    getting-started/global-configurations/authorization/sso/google: user-guide/global-configurations/authorization/sso/google.md
+    getting-started/global-configurations/authorization/sso/github: user-guide/global-configurations/authorization/sso/github.md
+    getting-started/global-configurations/authorization/sso/gitlab: user-guide/global-configurations/authorization/sso/gitlab.md
+    getting-started/global-configurations/authorization/sso/microsoft: user-guide/global-configurations/authorization/sso/microsoft.md
+    getting-started/global-configurations/authorization/sso/ldap: user-guide/global-configurations/authorization/sso/ldap.md
+    getting-started/global-configurations/authorization/sso/oidc: user-guide/global-configurations/authorization/sso/oidc.md
+    getting-started/global-configurations/authorization/sso/openshift: user-guide/global-configurations/authorization/sso/openshift.md
+    getting-started/global-configurations/okta: user-guide/global-configurations/okta.md
+    getting-started/global-configurations/catalog-framework: user-guide/global-configurations/catalog-framework.md
+    getting-started/global-configurations/scoped-variables: user-guide/global-configurations/scoped-variables.md
+    getting-started/global-configurations/pull-image-digest: user-guide/global-configurations/pull-image-digest.md
+    getting-started/global-configurations/tags-policy: user-guide/global-configurations/tags-policy.md
+    getting-started/global-configurations/lock-deployment-config: user-guide/global-configurations/lock-deployment-config.md
+    getting-started/global-configurations/image-promotion-policy: user-guide/global-configurations/image-promotion-policy.md
+    getting-started/global-configurations/filter-condition: user-guide/global-configurations/filter-condition.md
+    getting-started/global-configurations/build-infra: user-guide/global-configurations/build-infra.md
+    getting-started/global-configurations/gitops: user-guide/global-configurations/gitops.md
+    getting-started/global-configurations/custom-charts: user-guide/global-configurations/custom-charts.md
+    getting-started/global-configurations/external-links: user-guide/global-configurations/external-links.md
+    getting-started/global-configurations/projects: user-guide/global-configurations/projects.md
+    getting-started/global-configurations/manage-notification: user-guide/global-configurations/manage-notification.md
+    getting-started/global-configurations/git-accounts: user-guide/global-configurations/git-accounts.md
+    getting-started/global-configurations/chart-repo: user-guide/global-configurations/chart-repo.md
+    getting-started/global-configurations/cluster-and-environments: user-guide/global-configurations/cluster-and-environments.md
+    getting-started/global-configurations/authorization: user-guide/global-configurations/authorization/README.md
+    getting-started/global-configurations/authorization/user-access: user-guide/global-configurations/authorization/user-access.md
+    getting-started/global-configurations/authorization/permission-groups: user-guide/global-configurations/authorization/permission-groups.md
+    getting-started/global-configurations/authorization/api-tokens: user-guide/global-configurations/authorization/api-tokens.md
     global-configurations/sso-login: user-guide/global-configurations/sso-login.md
     user-guide/use-cases/untitled-3: user-guide/use-cases/connect-django-with-mysql-database.md
     global-configurations/api-token: user-guide/global-configurations/authorization/api-tokens.md
     user-guide/creating-application/workflow/ci-pipeline2: user-guide/creating-application/workflow/ci-pipeline.md
     user-guide/clusters: user-guide/resource-browser.md
     usage/clusters: user-guide/resource-browser.md
+    global-configurations/authorization/sso-login/okta: user-guide/global-configurations/authorization/sso/okta.md
+    usage/applications/creating-application/ci-pipeline/ci-build-pre-post-plugins: user-guide/creating-application/workflow/ci-build-pre-post-plugins.md

.github/CODEOWNERS

@@ -1,5 +1,5 @@
 #ALL
-* @vikramdevtron @kripanshdevtron @nishant-d
+* @vikramdevtron @kripanshdevtron @nishant-d @prakarsh-dt
 
 #DOCS
 docs/ @ashokdevtron @uxarya-d @prakarsh-dt
@@ -8,6 +8,7 @@ docs/ @ashokdevtron @uxarya-d @prakarsh-dt
 #Helm Charts
 charts/devtron/ @prakarsh-dt @pawan-mehta-dt @nishant-d
 scripts/devtron-reference-helm-charts @prakarsh-dt @pawan-mehta-dt @nishant-d
+CHANGELOG/ @prakarsh-dt @pawan-mehta-dt @nishant-d
 
 #Migration scripts
 scripts/sql @prakarsh-dt @vikramdevtron @kripanshdevtron @nishant-d

.github/workflows/azure-devops-issue-sync.yml

@@ -0,0 +1,94 @@
+name: Multi-Arch Image Check
+
+on:
+  pull_request:
+    types: [opened, edited, synchronize, reopened]
+
+
+jobs:
+  check-multiarch:
+    name: Check Multi-Arch Images
+    if: github.event.pull_request.base.ref == 'main' && github.event.pull_request.head.ref == 'release-bot'
+    runs-on: ubuntu-latest
+    
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Install yq
+      run: |
+        sudo apt-get update && sudo apt-get install -y jq
+        sudo apt-get install -y python3-pip
+        sudo pip3 install yq
+
+    - name: Check Multi-Arch Images
+      env:
+         GITHUB_TOKEN: ${{ github.token }}
+         PRNUM: ${{ github.event.pull_request.number }}
+         REPO: ${{ github.repository }}
+      run: |
+         yq '.' charts/devtron/values.yaml > values.json
+
+         #fetching container registry
+         container_registry=$(yq -r '.global.containerRegistry' values.json)
+         echo "Container Registry: $container_registry"
+
+         #function to check the architecture of image
+         get_image_arch() {
+             local image="$1"
+             local image_ref=$(echo $image | sed 's/:.*//')
+             
+             # skipping the check for 'inception', 'postgres' , 'postgres_exporter' and 'workflow-controller' images
+             if [[ "$image_ref" == "inception" || "$image_ref" == "postgres" || "$image_ref" == "postgres_exporter" || "$image_ref" == "workflow-controller" ]]; then
+                 return
+             fi
+            
+             local arch=$(docker manifest inspect "$container_registry/$image" | jq -r '.manifests[].platform.architecture' | sort | uniq)
+
+             # printing the error, if found any
+             if [ $? -ne 0 ]; then
+                 error_images+=("$image")
+                 return
+             fi
+
+             if ! (echo "$arch" | grep -q "amd64" && (echo "$arch" | grep -q "arm64" || echo "$arch" | grep -q "arm")); then
+                 non_multiarch_images+=("$image")
+             else
+                 echo "$image supports multi-architecture: $arch"
+             fi
+         }
+
+         #fetching the image information
+         while read -r line; do
+             image=$(echo "$line" | cut -d'"' -f4)
+             if [ -n "$image" ]; then
+                 echo "$image"
+                 get_image_arch "$image"
+             fi
+         done < <(grep -Eo '"image":\s*"[^"]*"' values.json)
+
+         while read -r line; do
+             cicd_image=$(echo "$line" | cut -d'"' -f4)
+             if [ -n "$cicd_image" ]; then
+                 echo "$cicd_image"
+                 get_image_arch "$cicd_image"
+             fi
+         done < <(grep -Eo '"cicdImage":\s*"[^"]*"' values.json)
+         
+          
+         if [ ${#non_multiarch_images[@]} -ne 0 ]; then
+             echo "The following images do not support multi-architecture:"
+             printf '%s\n' "${non_multiarch_images[@]}"
+             gh pr edit $PRNUM --add-label "PR:MultiArch-failed"
+             gh pr edit $PRNUM --remove-label "PR:Ready-to-Review"
+             exit 1
+         else
+             echo "All images support multi-architecture."
+             echo "PR:Ready-to-Review, exiting gracefully"
+             gh pr edit $PRNUM --add-label "PR:Ready-to-Review"
+             gh pr edit $PRNUM --remove-label "PR:MultiArch-failed"
+             exit 0
+         fi

.github/workflows/multiarch_new.yaml

@@ -63,13 +63,18 @@ jobs:
         fi
         
         ### For ex: Fixes #2123
-        pattern1="((Fixes|Resolves) #[0-9]+)"
+        ### For ex: Fixes: #2123
+        pattern1="((Fixes|Resolves):? #[0-9]+)"
         
         ### For ex: Resolves https://github.com/devtron-labs/devtron/issues/2123
-        pattern2="((Fixes|Resolves) https://github.com/devtron-labs/devtron/issues/[0-9]+)"
+        pattern2="((Fixes|Resolves):? https://github.com/devtron-labs/devtron/issues/[0-9]+)"
+
         
         ### For ex: Fixes devtron-labs/devtron#2123
-        pattern3="((Fixes|Resolves) devtron-labs/devtron#[0-9]+)"
+        pattern3="((Fixes|Resolves):? devtron-labs/devtron#[0-9]+)"
+
+        ### For ex: Fixes [#4839](https://github.com/devtron-labs/devtron/issues/4839)
+        pattern4="(Fixes|Resolves):?\s+\[#([0-9]+)\]"
         
         # Get the pull request body
         PR_BODY=$(jq -r '.pull_request.body' $GITHUB_EVENT_PATH)
@@ -92,6 +97,10 @@ jobs:
             echo "$PR_BODY" | grep -iE "$pattern3" | head -n1 | awk -F '#' '{print $NF}' | tr -d '\r\n' > issue_num
             issue_num=$(cat issue_num)
             echo "issue_num is : $issue_num"
+        elif echo "$PR_BODY" | grep -iEq "$pattern4"; then
+            echo "$PR_BODY" | grep -oP "$pattern4" | head -n1 | grep -oP '#\K[0-9]+' | tr -d '\r\n' > issue_num
+            issue_num=$(cat issue_num)
+            echo "issue_num is : $issue_num"
         else
             echo "No Issue number detected hence failing the PR Validation check."
             if [[ $forked == true ]]; then

.github/workflows/pr-issue-validator.yaml

@@ -4,4 +4,3 @@
 .env
 /cmd/external-app/devtron-ea
 devtron
-/vendor/github.com/argoproj/argo-cd/assets

.gitignore

@@ -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,