Skip to content

Commit 3be5f94

Browse files
vikramdevtronvikramdevtron
authored
Merge pull request #6565 from devtron-labs/main-sync-develop-13may
sync: Main sync develop
2 parents dd0ca94 + 0680b3b commit 3be5f94

18 files changed

+113
-170
lines changed

‎.github/workflows/auto-label.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Devtron-auto-labeller
1+
name: Devtron-auto-labeler
22

33
on:
44
issue_comment:
@@ -25,11 +25,11 @@ jobs:
2525
ISSUE_NUMBER=$(jq -r '.issue.number // .pull_request.number' "$GITHUB_EVENT_PATH")
2626
COMMENT_AUTHOR=$(jq -r '.comment.user.login' "$GITHUB_EVENT_PATH")
2727
28-
ORG_NAME="satyam-tests"
28+
ORG_NAME="devtron-labs"
2929
3030
# Check if the person is authorized to add labels
31-
curl -s -H "Authorization: token $GH_TOKEN" "https://api.github.com/orgs/$ORG_NAME/members/$COMMENT_AUTHOR" > /dev/null
32-
if [[ $? -ne 0 ]]; then
31+
RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GH_TOKEN" "https://api.github.com/orgs/$ORG_NAME/members/$COMMENT_AUTHOR")
32+
if [[ "$RESPONSE" -ne 204 ]]; then
3333
gh issue comment "$ISSUE_NUMBER" --body "Hi @$COMMENT_AUTHOR, you must be a member of the organization '$ORG_NAME' to add or remove labels."
3434
echo "User '$COMMENT_AUTHOR' is not a member of the organization '$ORG_NAME'. Exiting."
3535
exit 1
@@ -53,7 +53,7 @@ jobs:
5353
fi
5454
fi
5555
56-
# Remove Label Logic
56+
# Removes Label Logic
5757
if [[ "$COMMENT_BODY" =~ ^/remove[[:space:]](.+)$ ]]; then
5858
LABEL_NAME_TO_REMOVE=$(echo "$COMMENT_BODY" | sed -n 's|/remove ||p')
5959
@@ -64,4 +64,4 @@ jobs:
6464
else
6565
echo "The label '$LABEL_NAME_TO_REMOVE' is not attached to issue #$ISSUE_NUMBER."
6666
fi
67-
fi
67+
fi

‎.github/workflows/create-release.yml

Lines changed: 56 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,70 @@
1-
# This workflow is used to create a github release from last tag pushed
1+
# This workflow is used to create tag and Release for OSS
22

33
name: Create Release
44

55
# Controls when the action will run. Workflow runs when manually triggered using the UI
66
# or on push in charts directory of main branch.
77
on:
8-
98
workflow_dispatch:
109

1110
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1211
jobs:
13-
# This workflow contains a single job called "create-release"
12+
13+
create-release-tag:
14+
runs-on: ubuntu-latest
15+
16+
env:
17+
GITHUB_TOKENS: ${{ secrets.GH_SYSTEMSDT_TOKEN }}
18+
GIT_CONFIG_EMAIL: ${{ secrets.GH_SYSTEMSDT_EMAIL }}
19+
GIT_CONFIG_NAME: ${{ secrets.GH_SYSTEMSDT_USERNAME }}
20+
GIT_USERNAME: ${{ secrets.GH_SYSTEMSDT_USERNAME }}
21+
GIT_REPO: ${{ github.repository }}
22+
REPO: https://github.com/devtron-labs/devtron
23+
RELEASE_BRANCH: "main"
24+
25+
steps:
26+
27+
- name: Configure Git
28+
run: |
29+
echo $GITHUB_TOKENS > tokens.txt
30+
gh auth login --with-token < tokens.txt
31+
git config --global user.email "$GIT_CONFIG_EMAIL"
32+
git config --global user.name "$GIT_CONFIG_NAME"
33+
34+
- name: Clone repository and create tag
35+
run: |
36+
mkdir preci && cd preci
37+
gh repo clone "$REPO"
38+
cd $(basename "$REPO")
39+
git checkout $RELEASE_BRANCH
40+
git pull origin $RELEASE_BRANCH
41+
NEXT_RELEASE_VERSION=v$(curl -s https://raw.githubusercontent.com/devtron-labs/charts/refs/heads/main/charts/devtron/Chart.yaml | grep 'appVersion' | awk '{print $2}')
42+
# Create and push tag
43+
git tag $NEXT_RELEASE_VERSION
44+
git push -f https://$GIT_USERNAME:$GITHUB_TOKENS@github.com/$GIT_REPO $NEXT_RELEASE_VERSION
45+
1446
create-release:
15-
# The type of runner that the job will run on
47+
needs: create-release-tag
1648
runs-on: ubuntu-latest
1749

1850
# Steps represent a sequence of tasks that will be executed as part of the job
1951
steps:
2052
# Runs series of commands to create a release
2153
- name: create-release
2254
run: |
23-
RELEASE_FILE_CONTENTS=$(curl -L -s "https://raw.githubusercontent.com/${GITHUB_REPOSITORY}/${RELEASE_BRANCH}/manifests/release.txt" )
24-
RELEASE_TYPE=$(echo $RELEASE_FILE_CONTENTS | awk '{print $1}')
2555
FILE_NAME=${FILE_NAME:=releasenotes.md}
2656
echo $RELEASE_TYPE
2757
echo $GITHUB_REPOSITORY
58+
echo $RELEASE_BRANCH
59+
version=$(curl -s https://raw.githubusercontent.com/devtron-labs/devtron/refs/heads/main/charts/devtron/Chart.yaml | grep "appVersion" | awk -F ': ' '{print $2}' )
60+
if [[ "$version" == *"-rc"* ]]; then
61+
RELEASE_TYPE="beta"
62+
else
63+
RELEASE_TYPE="minor"
64+
fi
2865
gh repo clone $GITHUB_REPOSITORY
2966
cd devtron
30-
if [[ "$RELEASE_TYPE" == "stable" ]]
67+
if [[ "$RELEASE_TYPE" == "major" || "$RELEASE_TYPE" == "minor" || "$RELEASE_TYPE" == "patch" ]]
3168
then
3269
tag=$(git tag --sort=committerdate | tail -1)
3370
echo $tag
@@ -39,11 +76,9 @@ jobs:
3976
git config --global user.name "$GIT_CONFIG_NAME"
4077
rm -f $FILE_NAME
4178
touch $FILE_NAME
42-
echo "## Bugs" > beta-releasenotes.md
43-
echo "## Enhancements" >> beta-releasenotes.md
44-
echo "## Documentation" >> beta-releasenotes.md
79+
echo "## Enhancements" > beta-releasenotes.md
80+
echo "## Bugs" >> beta-releasenotes.md
4581
echo "## Others" >> beta-releasenotes.md
46-
echo "beta -1 $tag" > manifests/release.txt
4782
git add .
4883
git commit -am "Updated release-notes files"
4984
git push -f https://${GIT_CONFIG_NAME}:${GH_TOKEN}@github.com/${GITHUB_REPOSITORY} release-bot
@@ -52,26 +87,29 @@ jobs:
5287
git checkout -b release-bot
5388
git config --global user.email "$GIT_CONFIG_EMAIL"
5489
git config --global user.name "$GIT_CONFIG_NAME"
55-
echo "## Bugs" > beta-releasenotes.md
56-
echo "## Enhancements" >> beta-releasenotes.md
57-
echo "## Documentation" >> beta-releasenotes.md
90+
echo "## Enhancements" > beta-releasenotes.md
91+
echo "## Bugs" >> beta-releasenotes.md
5892
echo "## Others" >> beta-releasenotes.md
5993
git add .
6094
git commit -am "Created release-notes files"
6195
git push -f https://${GIT_CONFIG_NAME}:${GH_TOKEN}@github.com/${GITHUB_REPOSITORY} release-bot
6296
echo "Not creating release due to beta"
6397
fi
6498
env:
99+
RELEASE_BRANCH: "main"
65100
GH_TOKEN: ${{ secrets.GH_SYSTEMSDT_TOKEN }}
66-
RELEASE_BRANCH: ${{ secrets.RELEASE_BRANCH }}
67101
GIT_CONFIG_NAME: ${{ vars.GH_SYSTEMSDT_USERNAME }}
68102
GIT_CONFIG_EMAIL: ${{ secrets.GH_SYSTEMSDT_EMAIL }}
69103
# Send notification on discord
70104
- name: discord-notify
71105
run: |
72-
RELEASE_FILE_CONTENTS=$(curl -L -s "https://raw.githubusercontent.com/${GITHUB_REPOSITORY}/${RELEASE_BRANCH}/manifests/release.txt" )
73-
RELEASE_TYPE=$(echo $RELEASE_FILE_CONTENTS | awk '{print $1}')
74-
if [[ "$RELEASE_TYPE" == "stable" ]]
106+
version=$(curl -s https://raw.githubusercontent.com/devtron-labs/devtron/refs/heads/main/charts/devtron/Chart.yaml | grep "appVersion" | awk -F ': ' '{print $2}' )
107+
if [[ "$version" == *"-rc"* ]]; then
108+
RELEASE_TYPE="beta"
109+
else
110+
RELEASE_TYPE="minor"
111+
fi
112+
if [[ "$RELEASE_TYPE" == "major" || "$RELEASE_TYPE" == "minor" || "$RELEASE_TYPE" == "patch" ]]
75113
then
76114
sudo apt install python3 python3-pip -y
77115
pip install discord-webhook
@@ -84,5 +122,3 @@ jobs:
84122
then
85123
echo "Not sending notification due to beta"
86124
fi
87-
env:
88-
RELEASE_BRANCH: ${{ secrets.RELEASE_BRANCH }}

‎CHANGELOG/release-notes-v1.5.1.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
## v1.5.1
2+
3+
## Bugs
4+
- fix: stack manager page break on server api giving internal server error (#6556)
5+
6+

‎api/restHandler/app/pipeline/configure/DeploymentPipelineRestHandler.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1418,11 +1418,8 @@ func (handler *PipelineConfigRestHandlerImpl) GetArtifactsForRollback(w http.Res
14181418
// rbac for edit tags access
14191419
var ciArtifactResponse bean.CiArtifactResponse
14201420
triggerAccess := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionTrigger, object)
1421-
if handler.pipelineRestHandlerEnvConfig.UseArtifactListApiV2 {
1422-
ciArtifactResponse, err = handler.pipelineBuilder.FetchArtifactForRollbackV2(cdPipelineId, app.Id, offset, limit, searchString, app, deploymentPipeline)
1423-
} else {
1424-
ciArtifactResponse, err = handler.pipelineBuilder.FetchArtifactForRollback(cdPipelineId, app.Id, offset, limit, searchString)
1425-
}
1421+
1422+
ciArtifactResponse, err = handler.pipelineBuilder.FetchArtifactForRollbackV2(cdPipelineId, app.Id, offset, limit, searchString, app, deploymentPipeline)
14261423

14271424
if err != nil {
14281425
handler.Logger.Errorw("service err, GetArtifactsForRollback", "err", err, "cdPipelineId", cdPipelineId)

‎charts/devtron/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: devtron-operator
3-
appVersion: 1.5.0
3+
appVersion: 1.5.1
44
description: Chart to configure and install Devtron. Devtron is a Kubernetes Orchestration system.
55
keywords:
66
- Devtron
@@ -11,7 +11,7 @@ keywords:
1111
- argocd
1212
- Hyperion
1313
engine: gotpl
14-
version: 0.22.90
14+
version: 0.22.92
1515
sources:
1616
- https://github.com/devtron-labs/charts
1717
dependencies:

‎charts/devtron/devtron-bom.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ global:
1010
containerRegistry: "quay.io/devtron"
1111
extraManifests: []
1212
installer:
13-
release: "v1.5.0"
13+
release: "v1.5.1"
1414
registry: ""
1515
image: "inception"
1616
tag: "473deaa4-185-21582"
@@ -40,8 +40,8 @@ components:
4040
healthPort: 8080
4141
devtron:
4242
registry: ""
43-
image: "hyperion:e2daf69a-280-32104"
44-
cicdImage: "devtron:e2daf69a-434-32096"
43+
image: "hyperion:e4fc95a9-280-32767"
44+
cicdImage: "devtron:e4fc95a9-434-32763"
4545
imagePullPolicy: IfNotPresent
4646
customOverrides: {}
4747
podSecurityContext:

‎charts/devtron/templates/configmap-secret.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,4 +376,18 @@ data:
376376
{{- end }}
377377
{{- end }}
378378
{{- end }}
379-
{{- end }}
379+
{{- end }}
380+
{{- if $.Values.devtronEnterprise.enabled }}
381+
{{- if or $.Values.UCID $.Values.ucid }}
382+
---
383+
apiVersion: v1
384+
data:
385+
UCID: {{ $.Values.UCID | default $.Values.ucid }}
386+
kind: ConfigMap
387+
metadata:
388+
name: devtron-ucid
389+
namespace: devtroncd
390+
annotations:
391+
"helm.sh/hook": pre-install
392+
{{- end }}
393+
{{- end }}

‎charts/devtron/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ global:
2828
extraManifests: []
2929
installer:
3030
repo: "devtron-labs/devtron"
31-
release: "v1.5.0"
31+
release: "v1.5.1"
3232
registry: ""
3333
image: inception
3434
tag: 473deaa4-185-21582
@@ -87,8 +87,8 @@ components:
8787
healthPort: 8080
8888
devtron:
8989
registry: ""
90-
image: "hyperion:e2daf69a-280-32104"
91-
cicdImage: "devtron:e2daf69a-434-32096"
90+
image: "hyperion:e4fc95a9-280-32767"
91+
cicdImage: "devtron:e4fc95a9-434-32763"
9292
imagePullPolicy: IfNotPresent
9393
customOverrides: {}
9494
healthPort: 8080

‎devtron-images.txt.source

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
quay.io/devtron/image-scanner:c49b4aa5-141-32102
22
quay.io/devtron/inception:473deaa4-185-21582
3-
quay.io/devtron/hyperion:e2daf69a-280-32104
3+
quay.io/devtron/hyperion:e4fc95a9-280-32767
44
public.ecr.aws/docker/library/redis:7.0.5-alpine
55
quay.io/argoproj/argocd:v2.5.2
66
quay.io/argoproj/workflow-controller:v3.4.3
@@ -11,7 +11,7 @@ quay.io/devtron/chart-sync:c49b4aa5-836-32103
1111
quay.io/devtron/curl:7.73.0
1212
quay.io/devtron/dashboard:0fc42ac3-690-32105
1313
quay.io/devtron/devtron-utils:dup-chart-repo-v1.1.0
14-
quay.io/devtron/devtron:e67c3b76-434-30101
14+
quay.io/devtron/devtron:e4fc95a9-434-32763
1515
quay.io/devtron/ci-runner:c49b4aa5-138-32101
1616
quay.io/devtron/dex:v2.30.2
1717
quay.io/devtron/git-sensor:c49b4aa5-200-32099

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ require (
307307

308308
replace (
309309
github.com/argoproj/argo-workflows/v3 v3.5.13 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
310-
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250504171511-cdbe7937e3ce
311-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce
310+
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250513072902-f8dc68360b7e
311+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250513072902-f8dc68360b7e
312312
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
313313
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
314314
k8s.io/api => k8s.io/api v0.29.7

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -829,10 +829,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
829829
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
830830
github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU=
831831
github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
832-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250504171511-cdbe7937e3ce h1:nOtGeg79z6NtyoGofOp9/5T1HZ2JA51sEMTgwz2CS1o=
833-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250504171511-cdbe7937e3ce/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
834-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce h1:U/TOmo1tqQVliypXwEtVStpzZo19hjNm4SEUR9FrTXM=
835-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
832+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250513072902-f8dc68360b7e h1:drzFWo268a6d1nG3vrmripZQew0GVQ0MbcGWN08BW2o=
833+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250513072902-f8dc68360b7e/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
834+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250513072902-f8dc68360b7e h1:oUUWj4//3Scw0lH+L37jch5u+CPMpYTaTVWZfuh5bi8=
835+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250513072902-f8dc68360b7e/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
836836
github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
837837
github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
838838
github.com/devtron-labs/protos v0.0.3-0.20250323220609-ecf8a0f7305e h1:U6UdYbW8a7xn5IzFPd8cywjVVPfutGJCudjePAfL/Hs=

‎manifests/install/devtron-installer.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ metadata:
44
name: installer-devtron
55
namespace: devtroncd
66
spec:
7-
url: https://raw.githubusercontent.com/devtron-labs/devtron/v1.5.0/manifests/installation-script
7+
url: https://raw.githubusercontent.com/devtron-labs/devtron/v1.5.1/manifests/installation-script

‎manifests/installation-script

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LTAG="v1.5.0";
1+
LTAG="v1.5.1";
22
REPO_RAW_URL="https://raw.githubusercontent.com/devtron-labs/devtron/";
33

44
log("executed devtron setup installation");

‎manifests/release.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
stable -1 v1.5.0
1+
beta -1 v1.5.0

0 commit comments

Comments
 (0)