Skip to content

Commit 7e027c5

Browse files
ShashwatDadhichShashwatDadhich
committed
Merge remote-tracking branch 'origin/main' into logger_handeled
2 parents 5996b2b + b80bbea commit 7e027c5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2481
-405
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: danhellem/github-actions-issue-to-work-item@v2.1
1414
env:
1515
ado_token: "${{ secrets.ADO_PERSONAL_ACCESS_TOKEN }}"
16-
github_token: "${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}"
16+
github_token: "${{ secrets.GH_SYSTEMSDT_TOKEN }}"
1717
ado_organization: "DevtronLabs"
1818
ado_project: "Devtron"
1919
ado_wit: "Bug"
@@ -26,7 +26,7 @@ jobs:
2626
uses: danhellem/github-actions-issue-to-work-item@v2.1
2727
env:
2828
ado_token: "${{ secrets.ADO_PERSONAL_ACCESS_TOKEN }}"
29-
github_token: "${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}"
29+
github_token: "${{ secrets.GH_SYSTEMSDT_TOKEN }}"
3030
ado_organization: "DevtronLabs"
3131
ado_project: "Devtron"
3232
ado_wit: "User Story"
@@ -50,7 +50,7 @@ jobs:
5050
steps:
5151
- uses: wow-actions/potential-duplicates@v1
5252
with:
53-
GITHUB_TOKEN: "${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}"
53+
GITHUB_TOKEN: "${{ secrets.GH_SYSTEMSDT_TOKEN }}"
5454
# Issue title filter work with anymatch https://www.npmjs.com/package/anymatch.
5555
# Any matched issue will stop detection immediately.
5656
# You can specify multi filters in each line.

‎.github/workflows/chart-sync.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
script-file: ${{ secrets.CHART_SYNC_SCRIPT_FILE }}
2828
git-target-repo: ${{ secrets.GIT_TARGET_REPO }}
2929
git-source-repo: ${{ secrets.GIT_SOURCE_REPO }}
30-
git-target-useremail: ${{ secrets.GIT_TARGET_EMAIL }}
31-
git-target-username: ${{ secrets.GIT_TARGET_USERNAME }}
32-
git-target-token: ${{ secrets.GIT_TARGET_TOKEN }}
30+
git-target-useremail: ${{ secrets.GH_SYSTEMSDT_EMAIL }}
31+
git-target-username: ${{ vars.GH_SYSTEMSDT_USERNAME }}
32+
git-target-token: ${{ secrets.GH_SYSTEMSDT_TOKEN }}
3333
git-target-dir: ${{ secrets.GIT_TARGET_DIR }}
3434
git-source-dir: ${{ secrets.GIT_SOURCE_DIR }}
3535
working-dir: ${{ secrets.WORKING_DIR }}

‎.github/workflows/create-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ jobs:
6262
echo "Not creating release due to beta"
6363
fi
6464
env:
65-
GH_TOKEN: ${{ secrets.GIT_TOKEN }}
65+
GH_TOKEN: ${{ secrets.GH_SYSTEMSDT_TOKEN }}
6666
RELEASE_BRANCH: ${{ secrets.RELEASE_BRANCH }}
67-
GIT_CONFIG_NAME: ${{ secrets.GIT_TARGET_USERNAME }}
68-
GIT_CONFIG_EMAIL: ${{ secrets.GIT_TARGET_EMAIL }}
67+
GIT_CONFIG_NAME: ${{ vars.GH_SYSTEMSDT_USERNAME }}
68+
GIT_CONFIG_EMAIL: ${{ secrets.GH_SYSTEMSDT_EMAIL }}
6969
# Send notification on discord
7070
- name: discord-notify
7171
run: |

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,26 @@ jobs:
1414
sync:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- run: |
17+
- env:
18+
GH_TOKEN: ${{ secrets.GH_SYSTEMSDT_TOKEN }}
19+
GIT_CONFIG_NAME: ${{ vars.GH_SYSTEMSDT_USERNAME }}
20+
GIT_CONFIG_EMAIL: ${{ secrets.GH_SYSTEMSDT_EMAIL }}
21+
run: |
1822
export GIT_USERNAME="${GIT_CONFIG_NAME}"
1923
export GIT_PASSWORD="${GH_TOKEN}"
2024
export ENTERPRISE_REPO="https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/devtron-labs/devtron-enterprise.git"
2125
git clone https://github.com/devtron-labs/devtron
2226
git clone $ENTERPRISE_REPO
23-
2427
cd devtron && export GIT_COMMIT_ID=`git log --format="%H" -n 1`
25-
2628
export GIT_COMMIT=${GIT_COMMIT_ID:0:8}
2729
echo $GIT_COMMIT
2830
git config --global user.email $GIT_CONFIG_EMAIL
2931
git config --global user.name $GIT_USERNAME
30-
3132
git status && git checkout main && git pull
32-
3333
cd ../devtron-enterprise && git status && git checkout main && git pull
3434
git remote add oss-devtron ../devtron && git remote -v && git remote update && git merge oss-devtron/main
3535
export WIRE_GEN_FILE_NAME="wire_gen.go"
3636
export CONFLICT_FILES=`git diff --name-only --diff-filter=U --relative`
37-
3837
if [[ $WIRE_GEN_FILE_NAME = $CONFLICT_FILES ]]
3938
then
4039
rm $WIRE_GEN_FILE_NAME
@@ -49,7 +48,3 @@ jobs:
4948
git checkout -b oss-enterprise-sync-$GIT_COMMIT && git push -u origin oss-enterprise-sync-$GIT_COMMIT
5049
PR_RESPONSE=$(gh pr create --title "SYNC: OSS sync for $GIT_COMMIT" --fill --base main --head oss-enterprise-sync-$GIT_COMMIT --repo $ENTERPRISE_REPO)
5150
echo "FINAL PR RESPONSE: $PR_RESPONSE"
52-
env:
53-
GH_TOKEN: ${{ secrets.GIT_TARGET_TOKEN }}
54-
GIT_CONFIG_NAME: ${{ secrets.GIT_TARGET_USERNAME }}
55-
GIT_CONFIG_EMAIL: ${{ secrets.GIT_TARGET_EMAIL }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ jobs:
5757
git commit -am "Updated release notes"
5858
git push https://${GIT_CONFIG_NAME}:${GH_TOKEN}@github.com/${GITHUB_REPOSITORY} $RELEASE_NOTES_BRANCH
5959
env:
60-
GH_TOKEN: ${{ secrets.GIT_TOKEN }}
61-
GIT_CONFIG_NAME: ${{ secrets.GIT_TARGET_USERNAME }}
62-
GIT_CONFIG_EMAIL: ${{ secrets.GIT_TARGET_EMAIL }}
60+
GH_TOKEN: ${{ secrets.GH_SYSTEMSDT_TOKEN }}
61+
GIT_CONFIG_NAME: ${{ vars.GH_SYSTEMSDT_USERNAME }}
62+
GIT_CONFIG_EMAIL: ${{ secrets.GH_SYSTEMSDT_EMAIL }}

‎api/deployment/DeploymentConfigRestHandler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ func (handler *DeploymentConfigRestHandlerImpl) DownloadChart(w http.ResponseWri
230230
common.WriteJsonResp(w, fmt.Errorf("error in parsing chartRefId : %s must be integer", chartRefId), nil, http.StatusBadRequest)
231231
return
232232
}
233-
manifestByteArr, err := handler.chartRefService.GetChartInBytes(chartRefId)
233+
manifestByteArr, err := handler.chartRefService.GetChartInBytes(chartRefId, false)
234234
if err != nil {
235235
handler.Logger.Errorw("error in converting chart to bytes", "err", err)
236236
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)

‎api/helm-app/gRPC/applicationClient.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ type HelmAppClient interface {
2828
IsReleaseInstalled(ctx context.Context, in *ReleaseIdentifier) (*BooleanResponse, error)
2929
RollbackRelease(ctx context.Context, in *RollbackReleaseRequest) (*BooleanResponse, error)
3030
TemplateChart(ctx context.Context, in *InstallReleaseRequest) (*TemplateChartResponse, error)
31+
TemplateChartBulk(ctx context.Context, in *BulkInstallReleaseRequest) (*BulkTemplateChartResponse, error)
3132
InstallReleaseWithCustomChart(ctx context.Context, in *HelmInstallCustomRequest) (*HelmInstallCustomResponse, error)
3233
GetNotes(ctx context.Context, request *InstallReleaseRequest) (*ChartNotesResponse, error)
3334
ValidateOCIRegistry(ctx context.Context, OCIRegistryRequest *RegistryCredential) (*OCIRegistryResponse, error)
@@ -293,6 +294,17 @@ func (impl *HelmAppClientImpl) TemplateChart(ctx context.Context, in *InstallRel
293294
}
294295
return response, nil
295296
}
297+
func (impl *HelmAppClientImpl) TemplateChartBulk(ctx context.Context, in *BulkInstallReleaseRequest) (*BulkTemplateChartResponse, error) {
298+
applicationClient, err := impl.getApplicationClient()
299+
if err != nil {
300+
return nil, err
301+
}
302+
response, err := applicationClient.TemplateChartBulk(ctx, in)
303+
if err != nil {
304+
return nil, err
305+
}
306+
return response, nil
307+
}
296308

297309
func (impl *HelmAppClientImpl) InstallReleaseWithCustomChart(ctx context.Context, in *HelmInstallCustomRequest) (*HelmInstallCustomResponse, error) {
298310
applicationClient, err := impl.getApplicationClient()

0 commit comments

Comments
 (0)