Merge branch 'main' into revamped-res-browser

Author: ashoknayak777

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

@@ -13,7 +13,7 @@ jobs:
         uses: danhellem/[email protected]
         env:
           ado_token: "${{ secrets.ADO_PERSONAL_ACCESS_TOKEN }}"
-          github_token: "${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}"
+          github_token: "${{ secrets.GH_SYSTEMSDT_TOKEN }}"
           ado_organization: "DevtronLabs"
           ado_project: "Devtron"
           ado_wit: "Bug"
@@ -26,7 +26,7 @@ jobs:
         uses: danhellem/[email protected]
         env:
           ado_token: "${{ secrets.ADO_PERSONAL_ACCESS_TOKEN }}"
-          github_token: "${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}"
+          github_token: "${{ secrets.GH_SYSTEMSDT_TOKEN }}"
           ado_organization: "DevtronLabs"
           ado_project: "Devtron"
           ado_wit: "User Story"
@@ -50,7 +50,7 @@ jobs:
     steps:
       - uses: wow-actions/potential-duplicates@v1
         with:
-          GITHUB_TOKEN: "${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}"
+          GITHUB_TOKEN: "${{ secrets.GH_SYSTEMSDT_TOKEN }}"
           # Issue title filter work with anymatch https://www.npmjs.com/package/anymatch.
           # Any matched issue will stop detection immediately.
           # You can specify multi filters in each line.

.github/workflows/chart-sync.yaml

@@ -27,9 +27,9 @@ jobs:
         script-file: ${{ secrets.CHART_SYNC_SCRIPT_FILE }}
         git-target-repo: ${{ secrets.GIT_TARGET_REPO }}
         git-source-repo: ${{ secrets.GIT_SOURCE_REPO }}
-        git-target-useremail: ${{ secrets.GIT_TARGET_EMAIL }}
-        git-target-username: ${{ secrets.GIT_TARGET_USERNAME }}
-        git-target-token: ${{ secrets.GIT_TARGET_TOKEN }}
+        git-target-useremail: ${{ secrets.GH_SYSTEMSDT_EMAIL }}
+        git-target-username: ${{ vars.GH_SYSTEMSDT_USERNAME }}
+        git-target-token: ${{ secrets.GH_SYSTEMSDT_TOKEN }}
         git-target-dir: ${{ secrets.GIT_TARGET_DIR }}
         git-source-dir: ${{ secrets.GIT_SOURCE_DIR }}
         working-dir: ${{ secrets.WORKING_DIR }}

.github/workflows/create-release.yml

@@ -62,10 +62,10 @@ jobs:
             echo "Not creating release due to beta"
         fi
       env:
-        GH_TOKEN: ${{ secrets.GIT_TOKEN }}
+        GH_TOKEN: ${{ secrets.GH_SYSTEMSDT_TOKEN }}
         RELEASE_BRANCH: ${{ secrets.RELEASE_BRANCH }}
-        GIT_CONFIG_NAME: ${{ secrets.GIT_TARGET_USERNAME }}
-        GIT_CONFIG_EMAIL: ${{ secrets.GIT_TARGET_EMAIL }}
+        GIT_CONFIG_NAME: ${{ vars.GH_SYSTEMSDT_USERNAME }}
+        GIT_CONFIG_EMAIL: ${{ secrets.GH_SYSTEMSDT_EMAIL }}
     # Send notification on discord
     - name: discord-notify
       run: |

.github/workflows/enterprise-repo-sync.yaml

@@ -14,27 +14,26 @@ jobs:
   sync:
     runs-on: ubuntu-latest
     steps:
-    - run: |
+    - env:
+        GH_TOKEN: ${{ secrets.GH_SYSTEMSDT_TOKEN }}
+        GIT_CONFIG_NAME: ${{ vars.GH_SYSTEMSDT_USERNAME }}
+        GIT_CONFIG_EMAIL: ${{ secrets.GH_SYSTEMSDT_EMAIL }}
+      run: |
          export GIT_USERNAME="${GIT_CONFIG_NAME}"
          export GIT_PASSWORD="${GH_TOKEN}"
          export ENTERPRISE_REPO="https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/devtron-labs/devtron-enterprise.git"
          git clone https://github.com/devtron-labs/devtron
          git clone $ENTERPRISE_REPO
-
          cd devtron && export GIT_COMMIT_ID=`git log --format="%H" -n 1`
-
          export GIT_COMMIT=${GIT_COMMIT_ID:0:8}
          echo $GIT_COMMIT
          git config --global user.email $GIT_CONFIG_EMAIL
          git config --global user.name $GIT_USERNAME
-
          git status && git checkout main && git pull
-
          cd ../devtron-enterprise && git status && git checkout main && git pull
          git remote add oss-devtron ../devtron && git remote -v && git remote update && git merge oss-devtron/main
          export WIRE_GEN_FILE_NAME="wire_gen.go"
          export CONFLICT_FILES=`git diff --name-only --diff-filter=U --relative`
-
          if [[ $WIRE_GEN_FILE_NAME = $CONFLICT_FILES ]]
          then
             rm $WIRE_GEN_FILE_NAME
@@ -49,7 +48,3 @@ jobs:
          git checkout -b oss-enterprise-sync-$GIT_COMMIT && git push -u origin oss-enterprise-sync-$GIT_COMMIT
          PR_RESPONSE=$(gh pr create --title "SYNC: OSS sync for $GIT_COMMIT" --fill --base main --head oss-enterprise-sync-$GIT_COMMIT --repo $ENTERPRISE_REPO)
          echo "FINAL PR RESPONSE: $PR_RESPONSE"
-      env:
-       GH_TOKEN: ${{ secrets.GIT_TARGET_TOKEN }}
-       GIT_CONFIG_NAME: ${{ secrets.GIT_TARGET_USERNAME }}
-       GIT_CONFIG_EMAIL: ${{ secrets.GIT_TARGET_EMAIL }}

.github/workflows/pager-duty-issue-escalate.yaml

@@ -15,7 +15,7 @@ jobs:
 
     - name: List issues with 'pager-duty' label
       env:
-        GITHUB_TOKEN: ${{ secrets.GIT_TARGET_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GH_SYSTEMSDT_TOKEN }}
       run: |
         issues=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
           -H "Accept: application/vnd.github.v3+json" \
@@ -39,7 +39,7 @@ jobs:
             assignee3="vivek-devtron"
 
             curl -X POST \
-              -H "Authorization: token ${{ secrets.GIT_TARGET_TOKEN }}" \
+              -H "Authorization: token ${{ secrets.GH_SYSTEMSDT_TOKEN }}" \
               -H "Accept: application/vnd.github.v3+json" \
               -d "{\"assignees\": [\"$assignee1\", \"$assignee2\", \"$assignee3\"]}" \
               "https://api.github.com/repos/${{ github.repository }}/issues/$issue_number/assignees"

.github/workflows/update-release-notes.yml

@@ -57,6 +57,6 @@ jobs:
         git commit -am "Updated release notes"
         git push https://${GIT_CONFIG_NAME}:${GH_TOKEN}@github.com/${GITHUB_REPOSITORY} $RELEASE_NOTES_BRANCH
       env:
-        GH_TOKEN: ${{ secrets.GIT_TOKEN }}
-        GIT_CONFIG_NAME: ${{ secrets.GIT_TARGET_USERNAME }}
-        GIT_CONFIG_EMAIL: ${{ secrets.GIT_TARGET_EMAIL }}
+        GH_TOKEN: ${{ secrets.GH_SYSTEMSDT_TOKEN }}
+        GIT_CONFIG_NAME: ${{ vars.GH_SYSTEMSDT_USERNAME }}
+        GIT_CONFIG_EMAIL: ${{ secrets.GH_SYSTEMSDT_EMAIL }}

CHANGELOG/release-notes-v0.6.29.md

@@ -0,0 +1,52 @@
+## v0.6.29
+
+
+
+## Bugs
+- fix: removed unused dependency (#4916)
+- fix: release not found alert (#4928)
+- fix: link external helm app to chart store (#4919)
+- fix: Corrected the error of fetching app name and pipeline name from CI_CD_EVENT (#4911)
+- fix:job name support added in input variables (#4863)
+- fix:duplicate workflow name fixed (#4841)
+- fix: deprecate latest in app store app version (#4896)
+- fix: rbac fix in case of project in upper case (#4840)
+- fix: use join cookie logic to extract token (#4892)
+- fix: chart sync job optimisation (#4631)
+- fix: depandabot version upgrade (#4792)
+- fix: injected app-serveice dependency into DeployedApplicationEventProcessor service (#4875)
+- fix: update argo app repo url in patch (#4876)
+- fix: removed code for gitops repo migration in devtron apps (#4838)
+- fix: return nil,err on git material fetch error (#4857)
+- fix: ns not found in case ips is being injected in cluster (in global config) (#4844)
+- fix: helm deployments stucked in queued for devtron apps (#4842)
+- fix: panic on re-trigger ci if pod deleted on BuildTriggerObject (#4826)
+- fix: hide ldap creds in in get req (#4788)
+- fix: 5xx 4.0 iter (#4620)
+- fix:  rolefilters correction with all applications and particular application selected. (#4820)
+- fix: extra check added for mono-repo migraiton (#4764)
+- fix: trim space from git repo Url on create and update material (#4787)
+## Enhancements
+- perf: memory optimizations and prom metrics on terminal session exposed (#4909)
+- feat: Added the Devtron CI Trigger Plugin (#4908)
+- feat:MailMaster Plugin v1.0 (#4825)
+- feat: Add support for git hash in the app and app group overview section _revised (#4836)
+- feat:Github Pull Request Closer (#4833)
+- feat: Added Apply job in k8s plugin (#4828)
+- feat: Branch Divergence Checker Plugin (#4806)
+- feat: added request method in audit logger (#4817)
+- feat: active inactive user phase 3 (#4649)
+## Documentation
+- doc: Added EnvVariablesFromFieldPath in Deployment Template (#4852)
+## Others
+- chore: migration support for notification db changes (#4906)
+- chore: App Store refactoring v4 (#4647)
+- chore: Resource mapping refactoring (#4813)
+- misc: Refactoring Pagerduty Issue Calculator script (#4856)
+- misc: Update github_pagerduty_score_calculation.yml (#4853)
+- misc: Update pager-duty.yaml (#4850)
+- misc: Pagerduty issue template change (#4796)
+- chore: Image scanning refactoring (#4802)
+- chore: refactoring v4 (#4775)
+
+

Dockerfile

@@ -9,7 +9,7 @@ ADD . /go/src/github.com/devtron-labs/devtron/
 RUN GOOS=linux make build-all
 
 # uncomment this post build arg
-FROM ubuntu as  devtron-all
+FROM ubuntu:22.04@sha256:1b8d8ff4777f36f19bfe73ee4df61e3a0b789caeff29caa019539ec7c9a57f95 as  devtron-all
 
 RUN apt update
 RUN apt install ca-certificates git curl -y

DockerfileEA

@@ -8,7 +8,7 @@ WORKDIR /go/src/github.com/devtron-labs/devtron
 ADD . /go/src/github.com/devtron-labs/devtron/
 RUN GOOS=linux make build-all
 
-FROM ubuntu as  devtron-ea
+FROM ubuntu:22.04@sha256:1b8d8ff4777f36f19bfe73ee4df61e3a0b789caeff29caa019539ec7c9a57f95 as  devtron-ea
 
 RUN apt update
 RUN apt install ca-certificates curl -y

Makefile

@@ -1,6 +1,6 @@
 #!make
 
-all: build
+all: fetch-all-env build
 
 TAG?=$(shell bash -c 'git log --pretty=format:'%h' -n 1')
 FLAGS=
@@ -63,3 +63,7 @@ build-all: build
 
 build-ea:
 	make --directory ./cmd/external-app build
+
+
+fetch-all-env:
+	go run fetchAllEnv/fetchAllEnv.go