Skip to content

sync: Main sync develop #6565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
May 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f126b3a
fix: rest handler missing return statements
Ash-exp Apr 30, 2025
a796c8a
Merge pull request #6545 from devtron-labs/fix-bulk-edit-api-response
Ash-exp May 2, 2025
7e0215f
Merge pull request #6546 from devtron-labs/feat-file-variable-cm-moun…
Ash-exp May 4, 2025
674837b
chore: update auto-label.yml (#6372)
satyampsoni May 5, 2025
7ca1d48
fix for incorrect artifact list coming in rollback when only one trig…
kartik-579 May 6, 2025
635250e
removed redundant function:
kartik-579 May 6, 2025
d27c90c
wip
kartik-579 May 6, 2025
a15b4d6
Merge pull request #6551 from devtron-labs/rollback-for-1st-trigger-i…
kartik-579 May 6, 2025
fd1c399
configurable ucid for enterprise (#6553)
akshatsinha007 May 7, 2025
c0d3426
idempotent pipeline timeline sql change (#6554)
kartik-579 May 7, 2025
0ceea38
Updated Chart.yaml (#6555)
akshatsinha007 May 7, 2025
c78e56e
main sync RC and vendor update
vikramdevtron May 8, 2025
bf44193
Merge pull request #6558 from devtron-labs/main-sync-rc-8may
vikramdevtron May 8, 2025
77f8b8a
misc: updated ucid-cm and added prehook (#6557)
akshatsinha007 May 8, 2025
85787d9
Merge pull request #6559 from devtron-labs/release-candidate-v0.35.0
vikramdevtron May 8, 2025
b6c99ce
vendor update for packet 35
vikramdevtron May 8, 2025
350dd04
Merge pull request #6560 from devtron-labs/vendor-update-packet-35
vikramdevtron May 8, 2025
0c5717a
misc: Updated the release creation action to create tag as well (#6439)
akshatsinha007 May 8, 2025
0477a6a
release: PR for v1.5.1 (#6563)
systemsdt May 8, 2025
b98c0c3
Update create-release.yml (#6564)
akshatsinha007 May 8, 2025
8598a40
main sync develop
vikramdevtron May 13, 2025
ba2928e
vendor update develop
vikramdevtron May 13, 2025
0680b3b
vendor update develop
vikramdevtron May 13, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/auto-label.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Devtron-auto-labeller
name: Devtron-auto-labeler

on:
issue_comment:
Expand All @@ -25,11 +25,11 @@ jobs:
ISSUE_NUMBER=$(jq -r '.issue.number // .pull_request.number' "$GITHUB_EVENT_PATH")
COMMENT_AUTHOR=$(jq -r '.comment.user.login' "$GITHUB_EVENT_PATH")

ORG_NAME="satyam-tests"
ORG_NAME="devtron-labs"

# Check if the person is authorized to add labels
curl -s -H "Authorization: token $GH_TOKEN" "https://api.github.com/orgs/$ORG_NAME/members/$COMMENT_AUTHOR" > /dev/null
if [[ $? -ne 0 ]]; then
RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GH_TOKEN" "https://api.github.com/orgs/$ORG_NAME/members/$COMMENT_AUTHOR")
if [[ "$RESPONSE" -ne 204 ]]; then
gh issue comment "$ISSUE_NUMBER" --body "Hi @$COMMENT_AUTHOR, you must be a member of the organization '$ORG_NAME' to add or remove labels."
echo "User '$COMMENT_AUTHOR' is not a member of the organization '$ORG_NAME'. Exiting."
exit 1
Expand All @@ -53,7 +53,7 @@ jobs:
fi
fi

# Remove Label Logic
# Removes Label Logic
if [[ "$COMMENT_BODY" =~ ^/remove[[:space:]](.+)$ ]]; then
LABEL_NAME_TO_REMOVE=$(echo "$COMMENT_BODY" | sed -n 's|/remove ||p')

Expand All @@ -64,4 +64,4 @@ jobs:
else
echo "The label '$LABEL_NAME_TO_REMOVE' is not attached to issue #$ISSUE_NUMBER."
fi
fi
fi
76 changes: 56 additions & 20 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,70 @@
# This workflow is used to create a github release from last tag pushed
# This workflow is used to create tag and Release for OSS

name: Create Release

# Controls when the action will run. Workflow runs when manually triggered using the UI
# or on push in charts directory of main branch.
on:

workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "create-release"

create-release-tag:
runs-on: ubuntu-latest

env:
GITHUB_TOKENS: ${{ secrets.GH_SYSTEMSDT_TOKEN }}
GIT_CONFIG_EMAIL: ${{ secrets.GH_SYSTEMSDT_EMAIL }}
GIT_CONFIG_NAME: ${{ secrets.GH_SYSTEMSDT_USERNAME }}
GIT_USERNAME: ${{ secrets.GH_SYSTEMSDT_USERNAME }}
GIT_REPO: ${{ github.repository }}
REPO: https://github.com/devtron-labs/devtron
RELEASE_BRANCH: "main"

steps:

- name: Configure Git
run: |
echo $GITHUB_TOKENS > tokens.txt
gh auth login --with-token < tokens.txt
git config --global user.email "$GIT_CONFIG_EMAIL"
git config --global user.name "$GIT_CONFIG_NAME"

- name: Clone repository and create tag
run: |
mkdir preci && cd preci
gh repo clone "$REPO"
cd $(basename "$REPO")
git checkout $RELEASE_BRANCH
git pull origin $RELEASE_BRANCH
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}')
# Create and push tag
git tag $NEXT_RELEASE_VERSION
git push -f https://$GIT_USERNAME:$GITHUB_TOKENS@github.com/$GIT_REPO $NEXT_RELEASE_VERSION

create-release:
# The type of runner that the job will run on
needs: create-release-tag
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Runs series of commands to create a release
- name: create-release
run: |
RELEASE_FILE_CONTENTS=$(curl -L -s "https://raw.githubusercontent.com/${GITHUB_REPOSITORY}/${RELEASE_BRANCH}/manifests/release.txt" )
RELEASE_TYPE=$(echo $RELEASE_FILE_CONTENTS | awk '{print $1}')
FILE_NAME=${FILE_NAME:=releasenotes.md}
echo $RELEASE_TYPE
echo $GITHUB_REPOSITORY
echo $RELEASE_BRANCH
version=$(curl -s https://raw.githubusercontent.com/devtron-labs/devtron/refs/heads/main/charts/devtron/Chart.yaml | grep "appVersion" | awk -F ': ' '{print $2}' )
if [[ "$version" == *"-rc"* ]]; then
RELEASE_TYPE="beta"
else
RELEASE_TYPE="minor"
fi
gh repo clone $GITHUB_REPOSITORY
cd devtron
if [[ "$RELEASE_TYPE" == "stable" ]]
if [[ "$RELEASE_TYPE" == "major" || "$RELEASE_TYPE" == "minor" || "$RELEASE_TYPE" == "patch" ]]
then
tag=$(git tag --sort=committerdate | tail -1)
echo $tag
Expand All @@ -39,11 +76,9 @@ jobs:
git config --global user.name "$GIT_CONFIG_NAME"
rm -f $FILE_NAME
touch $FILE_NAME
echo "## Bugs" > beta-releasenotes.md
echo "## Enhancements" >> beta-releasenotes.md
echo "## Documentation" >> beta-releasenotes.md
echo "## Enhancements" > beta-releasenotes.md
echo "## Bugs" >> beta-releasenotes.md
echo "## Others" >> beta-releasenotes.md
echo "beta -1 $tag" > manifests/release.txt
git add .
git commit -am "Updated release-notes files"
git push -f https://${GIT_CONFIG_NAME}:${GH_TOKEN}@github.com/${GITHUB_REPOSITORY} release-bot
Expand All @@ -52,26 +87,29 @@ jobs:
git checkout -b release-bot
git config --global user.email "$GIT_CONFIG_EMAIL"
git config --global user.name "$GIT_CONFIG_NAME"
echo "## Bugs" > beta-releasenotes.md
echo "## Enhancements" >> beta-releasenotes.md
echo "## Documentation" >> beta-releasenotes.md
echo "## Enhancements" > beta-releasenotes.md
echo "## Bugs" >> beta-releasenotes.md
echo "## Others" >> beta-releasenotes.md
git add .
git commit -am "Created release-notes files"
git push -f https://${GIT_CONFIG_NAME}:${GH_TOKEN}@github.com/${GITHUB_REPOSITORY} release-bot
echo "Not creating release due to beta"
fi
env:
RELEASE_BRANCH: "main"
GH_TOKEN: ${{ secrets.GH_SYSTEMSDT_TOKEN }}
RELEASE_BRANCH: ${{ secrets.RELEASE_BRANCH }}
GIT_CONFIG_NAME: ${{ vars.GH_SYSTEMSDT_USERNAME }}
GIT_CONFIG_EMAIL: ${{ secrets.GH_SYSTEMSDT_EMAIL }}
# Send notification on discord
- name: discord-notify
run: |
RELEASE_FILE_CONTENTS=$(curl -L -s "https://raw.githubusercontent.com/${GITHUB_REPOSITORY}/${RELEASE_BRANCH}/manifests/release.txt" )
RELEASE_TYPE=$(echo $RELEASE_FILE_CONTENTS | awk '{print $1}')
if [[ "$RELEASE_TYPE" == "stable" ]]
version=$(curl -s https://raw.githubusercontent.com/devtron-labs/devtron/refs/heads/main/charts/devtron/Chart.yaml | grep "appVersion" | awk -F ': ' '{print $2}' )
if [[ "$version" == *"-rc"* ]]; then
RELEASE_TYPE="beta"
else
RELEASE_TYPE="minor"
fi
if [[ "$RELEASE_TYPE" == "major" || "$RELEASE_TYPE" == "minor" || "$RELEASE_TYPE" == "patch" ]]
then
sudo apt install python3 python3-pip -y
pip install discord-webhook
Expand All @@ -84,5 +122,3 @@ jobs:
then
echo "Not sending notification due to beta"
fi
env:
RELEASE_BRANCH: ${{ secrets.RELEASE_BRANCH }}
6 changes: 6 additions & 0 deletions CHANGELOG/release-notes-v1.5.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
## v1.5.1

## Bugs
- fix: stack manager page break on server api giving internal server error (#6556)


Original file line number Diff line number Diff line change
Expand Up @@ -1418,11 +1418,8 @@ func (handler *PipelineConfigRestHandlerImpl) GetArtifactsForRollback(w http.Res
// rbac for edit tags access
var ciArtifactResponse bean.CiArtifactResponse
triggerAccess := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionTrigger, object)
if handler.pipelineRestHandlerEnvConfig.UseArtifactListApiV2 {
ciArtifactResponse, err = handler.pipelineBuilder.FetchArtifactForRollbackV2(cdPipelineId, app.Id, offset, limit, searchString, app, deploymentPipeline)
} else {
ciArtifactResponse, err = handler.pipelineBuilder.FetchArtifactForRollback(cdPipelineId, app.Id, offset, limit, searchString)
}

ciArtifactResponse, err = handler.pipelineBuilder.FetchArtifactForRollbackV2(cdPipelineId, app.Id, offset, limit, searchString, app, deploymentPipeline)

if err != nil {
handler.Logger.Errorw("service err, GetArtifactsForRollback", "err", err, "cdPipelineId", cdPipelineId)
Expand Down
4 changes: 2 additions & 2 deletions charts/devtron/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: devtron-operator
appVersion: 1.5.0
appVersion: 1.5.1
description: Chart to configure and install Devtron. Devtron is a Kubernetes Orchestration system.
keywords:
- Devtron
Expand All @@ -11,7 +11,7 @@ keywords:
- argocd
- Hyperion
engine: gotpl
version: 0.22.90
version: 0.22.92
sources:
- https://github.com/devtron-labs/charts
dependencies:
Expand Down
6 changes: 3 additions & 3 deletions charts/devtron/devtron-bom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ global:
containerRegistry: "quay.io/devtron"
extraManifests: []
installer:
release: "v1.5.0"
release: "v1.5.1"
registry: ""
image: "inception"
tag: "473deaa4-185-21582"
Expand Down Expand Up @@ -40,8 +40,8 @@ components:
healthPort: 8080
devtron:
registry: ""
image: "hyperion:e2daf69a-280-32104"
cicdImage: "devtron:e2daf69a-434-32096"
image: "hyperion:e4fc95a9-280-32767"
cicdImage: "devtron:e4fc95a9-434-32763"
imagePullPolicy: IfNotPresent
customOverrides: {}
podSecurityContext:
Expand Down
16 changes: 15 additions & 1 deletion charts/devtron/templates/configmap-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -376,4 +376,18 @@ data:
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- if $.Values.devtronEnterprise.enabled }}
{{- if or $.Values.UCID $.Values.ucid }}
---
apiVersion: v1
data:
UCID: {{ $.Values.UCID | default $.Values.ucid }}
kind: ConfigMap
metadata:
name: devtron-ucid
namespace: devtroncd
annotations:
"helm.sh/hook": pre-install
{{- end }}
{{- end }}
6 changes: 3 additions & 3 deletions charts/devtron/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ global:
extraManifests: []
installer:
repo: "devtron-labs/devtron"
release: "v1.5.0"
release: "v1.5.1"
registry: ""
image: inception
tag: 473deaa4-185-21582
Expand Down Expand Up @@ -87,8 +87,8 @@ components:
healthPort: 8080
devtron:
registry: ""
image: "hyperion:e2daf69a-280-32104"
cicdImage: "devtron:e2daf69a-434-32096"
image: "hyperion:e4fc95a9-280-32767"
cicdImage: "devtron:e4fc95a9-434-32763"
imagePullPolicy: IfNotPresent
customOverrides: {}
healthPort: 8080
Expand Down
4 changes: 2 additions & 2 deletions devtron-images.txt.source
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
quay.io/devtron/image-scanner:c49b4aa5-141-32102
quay.io/devtron/inception:473deaa4-185-21582
quay.io/devtron/hyperion:e2daf69a-280-32104
quay.io/devtron/hyperion:e4fc95a9-280-32767
public.ecr.aws/docker/library/redis:7.0.5-alpine
quay.io/argoproj/argocd:v2.5.2
quay.io/argoproj/workflow-controller:v3.4.3
Expand All @@ -11,7 +11,7 @@ quay.io/devtron/chart-sync:c49b4aa5-836-32103
quay.io/devtron/curl:7.73.0
quay.io/devtron/dashboard:0fc42ac3-690-32105
quay.io/devtron/devtron-utils:dup-chart-repo-v1.1.0
quay.io/devtron/devtron:e67c3b76-434-30101
quay.io/devtron/devtron:e4fc95a9-434-32763
quay.io/devtron/ci-runner:c49b4aa5-138-32101
quay.io/devtron/dex:v2.30.2
quay.io/devtron/git-sensor:c49b4aa5-200-32099
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,8 @@ require (

replace (
github.com/argoproj/argo-workflows/v3 v3.5.13 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250504171511-cdbe7937e3ce
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250513072902-f8dc68360b7e
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250513072902-f8dc68360b7e
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
k8s.io/api => k8s.io/api v0.29.7
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -829,10 +829,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU=
github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250504171511-cdbe7937e3ce h1:nOtGeg79z6NtyoGofOp9/5T1HZ2JA51sEMTgwz2CS1o=
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250504171511-cdbe7937e3ce/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce h1:U/TOmo1tqQVliypXwEtVStpzZo19hjNm4SEUR9FrTXM=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250513072902-f8dc68360b7e h1:drzFWo268a6d1nG3vrmripZQew0GVQ0MbcGWN08BW2o=
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250513072902-f8dc68360b7e/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250513072902-f8dc68360b7e h1:oUUWj4//3Scw0lH+L37jch5u+CPMpYTaTVWZfuh5bi8=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250513072902-f8dc68360b7e/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
github.com/devtron-labs/protos v0.0.3-0.20250323220609-ecf8a0f7305e h1:U6UdYbW8a7xn5IzFPd8cywjVVPfutGJCudjePAfL/Hs=
Expand Down
2 changes: 1 addition & 1 deletion manifests/install/devtron-installer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ metadata:
name: installer-devtron
namespace: devtroncd
spec:
url: https://raw.githubusercontent.com/devtron-labs/devtron/v1.5.0/manifests/installation-script
url: https://raw.githubusercontent.com/devtron-labs/devtron/v1.5.1/manifests/installation-script
2 changes: 1 addition & 1 deletion manifests/installation-script
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LTAG="v1.5.0";
LTAG="v1.5.1";
REPO_RAW_URL="https://raw.githubusercontent.com/devtron-labs/devtron/";

log("executed devtron setup installation");
2 changes: 1 addition & 1 deletion manifests/release.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
stable -1 v1.5.0
beta -1 v1.5.0
Loading