diff --git a/.github/workflows/auto-label.yml b/.github/workflows/auto-label.yml index 00b822dd7b..5114ad3190 100644 --- a/.github/workflows/auto-label.yml +++ b/.github/workflows/auto-label.yml @@ -1,4 +1,4 @@ -name: Devtron-auto-labeller +name: Devtron-auto-labeler on: issue_comment: @@ -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 @@ -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') @@ -64,4 +64,4 @@ jobs: else echo "The label '$LABEL_NAME_TO_REMOVE' is not attached to issue #$ISSUE_NUMBER." fi - fi \ No newline at end of file + fi diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 14d1400a59..936c32a766 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -1,18 +1,50 @@ -# 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 @@ -20,14 +52,19 @@ jobs: # 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 @@ -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 @@ -52,9 +87,8 @@ 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" @@ -62,16 +96,20 @@ jobs: 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 @@ -84,5 +122,3 @@ jobs: then echo "Not sending notification due to beta" fi - env: - RELEASE_BRANCH: ${{ secrets.RELEASE_BRANCH }} diff --git a/CHANGELOG/release-notes-v1.5.1.md b/CHANGELOG/release-notes-v1.5.1.md new file mode 100644 index 0000000000..fb6c27b636 --- /dev/null +++ b/CHANGELOG/release-notes-v1.5.1.md @@ -0,0 +1,6 @@ +## v1.5.1 + +## Bugs +- fix: stack manager page break on server api giving internal server error (#6556) + + diff --git a/api/restHandler/app/pipeline/configure/DeploymentPipelineRestHandler.go b/api/restHandler/app/pipeline/configure/DeploymentPipelineRestHandler.go index 89f95436ed..4a94fff0b5 100644 --- a/api/restHandler/app/pipeline/configure/DeploymentPipelineRestHandler.go +++ b/api/restHandler/app/pipeline/configure/DeploymentPipelineRestHandler.go @@ -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) diff --git a/charts/devtron/Chart.yaml b/charts/devtron/Chart.yaml index 33e6cbfbc5..2dcb873a1c 100644 --- a/charts/devtron/Chart.yaml +++ b/charts/devtron/Chart.yaml @@ -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 @@ -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: diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml index c5a3cebb09..7799e0c877 100644 --- a/charts/devtron/devtron-bom.yaml +++ b/charts/devtron/devtron-bom.yaml @@ -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" @@ -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: diff --git a/charts/devtron/templates/configmap-secret.yaml b/charts/devtron/templates/configmap-secret.yaml index efe2d36e9f..04b79f4e52 100644 --- a/charts/devtron/templates/configmap-secret.yaml +++ b/charts/devtron/templates/configmap-secret.yaml @@ -376,4 +376,18 @@ data: {{- end }} {{- end }} {{- end }} -{{- end }} \ No newline at end of file +{{- 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 }} diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml index c254e73d51..82e65a1e65 100644 --- a/charts/devtron/values.yaml +++ b/charts/devtron/values.yaml @@ -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 @@ -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 diff --git a/devtron-images.txt.source b/devtron-images.txt.source index 6f420f5094..6367726db9 100644 --- a/devtron-images.txt.source +++ b/devtron-images.txt.source @@ -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 @@ -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 diff --git a/go.mod b/go.mod index 85da0f799c..2c6a817b62 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 542dcf1953..02c54553f2 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/manifests/install/devtron-installer.yaml b/manifests/install/devtron-installer.yaml index e7c5b98414..5a61704349 100644 --- a/manifests/install/devtron-installer.yaml +++ b/manifests/install/devtron-installer.yaml @@ -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 diff --git a/manifests/installation-script b/manifests/installation-script index 08922660ec..d8f38c6909 100644 --- a/manifests/installation-script +++ b/manifests/installation-script @@ -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"); diff --git a/manifests/release.txt b/manifests/release.txt index 7444c53000..0de219bacc 100644 --- a/manifests/release.txt +++ b/manifests/release.txt @@ -1 +1 @@ -stable -1 v1.5.0 +beta -1 v1.5.0 diff --git a/pkg/pipeline/AppArtifactManager.go b/pkg/pipeline/AppArtifactManager.go index 16b1678d49..8349f5d8f7 100644 --- a/pkg/pipeline/AppArtifactManager.go +++ b/pkg/pipeline/AppArtifactManager.go @@ -40,9 +40,6 @@ import ( type AppArtifactManager interface { RetrieveArtifactsByCDPipelineV2(pipeline *pipelineConfig.Pipeline, stage bean.WorkflowType, artifactListingFilterOpts *bean.ArtifactsListFilterOptions) (*bean2.CiArtifactResponse, error) - //FetchArtifactForRollback : - FetchArtifactForRollback(cdPipelineId, appId, offset, limit int, searchString string) (bean2.CiArtifactResponse, error) - FetchArtifactForRollbackV2(cdPipelineId, appId, offset, limit int, searchString string, app *bean2.CreateAppDTO, deploymentPipeline *pipelineConfig.Pipeline) (bean2.CiArtifactResponse, error) BuildArtifactsForCdStage(pipelineId int, stageType bean.WorkflowType, ciArtifacts []bean2.CiArtifactBean, artifactMap map[int]int, parent bool, limit int, parentCdId int) ([]bean2.CiArtifactBean, map[int]int, int, string, error) @@ -212,83 +209,6 @@ func (impl *AppArtifactManagerImpl) BuildArtifactsForCIParent(cdPipelineId int, return ciArtifacts, nil } -func (impl *AppArtifactManagerImpl) FetchArtifactForRollback(cdPipelineId, appId, offset, limit int, searchString string) (bean2.CiArtifactResponse, error) { - var deployedCiArtifacts []bean2.CiArtifactBean - var deployedCiArtifactsResponse bean2.CiArtifactResponse - - cdWfrs, err := impl.cdWorkflowRepository.FetchArtifactsByCdPipelineId(cdPipelineId, bean.CD_WORKFLOW_TYPE_DEPLOY, offset, limit, searchString) - if err != nil { - impl.logger.Errorw("error in getting artifacts for rollback by cdPipelineId", "err", err, "cdPipelineId", cdPipelineId) - return deployedCiArtifactsResponse, err - } - var ids []int32 - for _, item := range cdWfrs { - ids = append(ids, item.TriggeredBy) - } - userEmails := make(map[int32]string) - users, err := impl.userService.GetByIds(ids) - if err != nil { - impl.logger.Errorw("unable to fetch users by ids", "err", err, "ids", ids) - } - for _, item := range users { - userEmails[item.Id] = item.EmailId - } - - imageTagsDataMap, err := impl.imageTaggingService.GetTagsDataMapByAppId(appId) - if err != nil { - impl.logger.Errorw("error in getting image tagging data with appId", "err", err, "appId", appId) - return deployedCiArtifactsResponse, err - } - artifactIds := make([]int, 0) - - for _, cdWfr := range cdWfrs { - ciArtifact := &repository.CiArtifact{} - if cdWfr.CdWorkflow != nil && cdWfr.CdWorkflow.CiArtifact != nil { - ciArtifact = cdWfr.CdWorkflow.CiArtifact - } - if ciArtifact == nil { - continue - } - mInfo, err := parseMaterialInfo([]byte(ciArtifact.MaterialInfo), ciArtifact.DataSource) - if err != nil { - mInfo = []byte("[]") - impl.logger.Errorw("error in parsing ciArtifact material info", "err", err, "ciArtifact", ciArtifact) - } - userEmail := userEmails[cdWfr.TriggeredBy] - deployedCiArtifacts = append(deployedCiArtifacts, bean2.CiArtifactBean{ - Id: ciArtifact.Id, - Image: ciArtifact.Image, - MaterialInfo: mInfo, - DeployedTime: formatDate(cdWfr.StartedOn, bean2.LayoutRFC3339), - WfrId: cdWfr.Id, - DeployedBy: userEmail, - }) - artifactIds = append(artifactIds, ciArtifact.Id) - } - imageCommentsDataMap, err := impl.imageTaggingService.GetImageCommentsDataMapByArtifactIds(artifactIds) - if err != nil { - impl.logger.Errorw("error in getting GetImageCommentsDataMapByArtifactIds", "err", err, "appId", appId, "artifactIds", artifactIds) - return deployedCiArtifactsResponse, err - } - - for i, _ := range deployedCiArtifacts { - if imageTaggingResp := imageTagsDataMap[deployedCiArtifacts[i].Id]; imageTaggingResp != nil { - deployedCiArtifacts[i].ImageReleaseTags = imageTaggingResp - } - if imageCommentResp := imageCommentsDataMap[deployedCiArtifacts[i].Id]; imageCommentResp != nil { - deployedCiArtifacts[i].ImageComment = imageCommentResp - } - } - - deployedCiArtifactsResponse.CdPipelineId = cdPipelineId - if deployedCiArtifacts == nil { - deployedCiArtifacts = []bean2.CiArtifactBean{} - } - deployedCiArtifactsResponse.CiArtifacts = deployedCiArtifacts - - return deployedCiArtifactsResponse, nil -} - func (impl *AppArtifactManagerImpl) FetchArtifactForRollbackV2(cdPipelineId, appId, offset, limit int, searchString string, app *bean2.CreateAppDTO, deploymentPipeline *pipelineConfig.Pipeline) (bean2.CiArtifactResponse, error) { var deployedCiArtifactsResponse bean2.CiArtifactResponse imageTagsDataMap, err := impl.imageTaggingService.GetTagsDataMapByAppId(appId) diff --git a/releasenotes.md b/releasenotes.md index c716ae1779..fb6c27b636 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -1,36 +1,6 @@ - -====CRITICAL UPGRADE NOTICE - POSTGRES 11 TO 14==== +## v1.5.1 -IMPORTANT: This upgrade requires planned downtime -Before proceeding with the upgrade to version 1.5.0, please: - -1. Review the [Upgrade Guide](https://docs.devtron.ai/upgrade/devtron-upgrade-1.5.0) for all prerequisites. - -2. Deploy the [Devtron-Backup Chart](https://docs.devtron.ai/install/devtron-backup). - -3. Verify at least one successful backup has been completed. - -WARNING: Your Devtron will be unavailable during the entire prerequisite process until successful completion. - -For questions or assistance, our team is available on [Discord](https://discord.devtron.ai/). - +## Bugs +- fix: stack manager page break on server api giving internal server error (#6556) -## v1.5.0 -## Enhancements -- feat: Config Approval bypass v1 (for cm, cs and deployment template) (#6493) -- feat: Licensing changes (#6474) -## Bugs -- fix: Added support for IAM role S3 blob client (#6521) -- fix: Making tx independent of git sensor call (#6519) -- fix: Sql query memory issue (#6516) -- fix: Grafana data-source get API (#6503) -- fix: Made triggeredBy for CI & CD uniform (#6489) -- fix: HPA permission denied error (#6485) -- fix: Force abort for pre/post cd (#6475) -- fix: Optimisation in workflow status api (#6473) -- fix: Let user delete the container reg if the ref app was deleted (#6464) -## Others -- misc: Update the descriptions of env variables (#6499) -- misc: Patch api for user attribute (#6490) -- chore: Nil implementations fixed for user attribute in telemetry (#6497) diff --git a/scripts/sql/32903500_alter_pipeline_timeline.up.sql b/scripts/sql/32903500_alter_pipeline_timeline.up.sql index 63f65ef5f6..69e1269eda 100644 --- a/scripts/sql/32903500_alter_pipeline_timeline.up.sql +++ b/scripts/sql/32903500_alter_pipeline_timeline.up.sql @@ -1,3 +1,3 @@ -CREATE INDEX "idx_pipeline_status_timeline_cd_workflow_runner_id" ON pipeline_status_timeline USING BTREE ("cd_workflow_runner_id"); +CREATE INDEX IF NOT EXISTS "idx_pipeline_status_timeline_cd_workflow_runner_id" ON pipeline_status_timeline USING BTREE ("cd_workflow_runner_id"); -CREATE INDEX "idx_pipeline_status_timeline_installed_app_version_history_id" ON pipeline_status_timeline USING BTREE ("installed_app_version_history_id"); +CREATE INDEX IF NOT EXISTS "idx_pipeline_status_timeline_installed_app_version_history_id" ON pipeline_status_timeline USING BTREE ("installed_app_version_history_id"); diff --git a/vendor/modules.txt b/vendor/modules.txt index 7020ab31da..20e79a7ac1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -472,7 +472,7 @@ github.com/davecgh/go-spew/spew # github.com/deckarep/golang-set v1.8.0 ## explicit; go 1.17 github.com/deckarep/golang-set -# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250504171511-cdbe7937e3ce +# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250513072902-f8dc68360b7e ## explicit; go 1.21 github.com/devtron-labs/authenticator/apiToken github.com/devtron-labs/authenticator/client @@ -480,7 +480,7 @@ github.com/devtron-labs/authenticator/jwt github.com/devtron-labs/authenticator/middleware github.com/devtron-labs/authenticator/oidc github.com/devtron-labs/authenticator/password -# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce +# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250513072902-f8dc68360b7e ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/blob-storage @@ -2352,8 +2352,8 @@ xorm.io/xorm/log xorm.io/xorm/names xorm.io/xorm/schemas xorm.io/xorm/tags -# 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