Merge branch 'main' into image-promotion-policy

Author: ashokdevtron

.gitbook.yaml

@@ -76,4 +76,5 @@ redirects:
     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
+    usage/clusters: usage/resource-browser
 

.github/CODEOWNERS

@@ -9,5 +9,9 @@ docs/ @ashokdevtron @uxarya-d @prakarsh-dt
 charts/devtron/ @prakarsh-dt @pawan-mehta-dt @nishant-d
 scripts/devtron-reference-helm-charts @prakarsh-dt @pawan-mehta-dt @nishant-d
 
+#Migration scripts
+scripts/sql @prakarsh-dt @vikramdevtron @kripanshdevtron @nishant-d
+scripts/utilities @prakarsh-dt @nishant-d @pawan-mehta-dt
+
 #Github Specific
 .github/ @prakarsh-dt @nishant-d @pawan-mehta-dt

.github/ISSUE_TEMPLATE/pager-duty.yaml

@@ -18,15 +18,66 @@ body:
       description: "A clear and concise description of what the bug is."
       placeholder: "It bugs out when ..."
   - type: dropdown
-    id: criticality
+    id: affected-areas
     attributes:
-      label: "Criticality"
-      description: "How critical is the issue? Please include the impact in the  "
+      label: "Affected areas"
+      description: "What areas of Devtron are impacted by the issue?"
       options:
-        - P0 - Critical/Blocking
-        - P1 - High
-        - P2 - Medium
-        - P3 - Low
+        - Devtron dashboard completely down 
+        - Login issues 
+        - RBAC Issues 
+        - CI 
+        - CD 
+        - App creation 
+        - Deployment from Chart store 
+        - Security features 
+        - CI/CD Plugins 
+        - Other CRITICAL functionality 
+        - Other NON-CRITICAL functionality
+  - type: dropdown
+    id: additional-affected-areas
+    attributes:
+      label: "Additional affected areas"
+      description: "Are there any additional affected areas?"
+      options:
+        - Devtron dashboard completely down 
+        - Login issues 
+        - RBAC Issues 
+        - CI 
+        - CD 
+        - App creation 
+        - Deployment from Chart store 
+        - Security features
+        - CI/CD Plugins 
+        - Other CRITICAL functionality 
+        - Other NON-CRITICAL functionality 
+  - type: dropdown
+    id: prod-environment
+    attributes:
+      label: "Prod/Non-prod environments?"
+      description: "Is the issue affecting Prod environments?"
+      options:
+        - Prod 
+        - Non-prod 
+  - type: dropdown
+    id: user-unblocked
+    attributes:
+      label: "Is User unblocked?"
+      description: "Is the User unblocked?"
+      options:
+        - 'Yes' 
+        - 'No'
+  - type: dropdown
+    id: user-unblocked-reason
+    attributes:
+      label: "How was the user un-blocked?"
+      description: "If the user was unblocked. How was the user un-blocked?"
+      options:
+        - TEMPORARILY - By disabling a CRITICAL functionality 
+        - TEMPORARILY - By disabling a NON-CRITICAL functionality 
+        - TEMPORARILY - By doing some changes from the backend/DB 
+        - PERMANENTLY - By giving a workaround (From outside Devtron) 
+        - PERMANENTLY - By giving a workaround (Within Devtron) 
   - type: textarea
     id: impact
     validations:
@@ -91,14 +142,6 @@ body:
         - Something Else
     validations:
       required: true
-  - type: textarea
-    id: environment
-    validations:
-      required: false
-    attributes:
-      label: "🧱 Your Environment"
-      description: "Is your environment customized in any way? Provide your Browser version as well."
-      placeholder: "I use XYZ for ..."
   - type: textarea
     id: solution
     validations:

.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/github_pagerduty_score_calculation.yml

@@ -0,0 +1,27 @@
+name: Issue Created
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  extract-issue-body:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x' 
+
+      - name: Check if pager-duty template is used
+        if: ${{ contains(github.event.issue.labels.*.name, 'pager-duty') && contains(github.event.issue.labels.*.name, 'bug') }}
+        run: |
+          echo "Issue was created using pager-duty template"
+          python3 scripts/utilities/github_pagerduty_issue_score_calculation.py
+        env:
+          ISSUE_NUMBER: ${{ github.event.issue.number }}
+          ISSUE_BODY: ${{ github.event.issue.body }}
+          GITHUB_TOKEN: ${{ github.token }}
+          PAGERDUTY_SCORE_THRESHOLD: ${{ vars.PAGERDUTY_SCORE_THRESHOLD }}

.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 }}