Merge branch 'develop' into mandatory-tag-v2

# Conflicts:
#	go.mod
#	go.sum
#	vendor/modules.txt

Author: prkhrkat

.github/ISSUE_TEMPLATE/bug.yaml

@@ -1,7 +1,7 @@
 name: "🐛 Bug Report"
 description: "Submit a bug report to help us improve"
 title: "Bug: "
-labels: [bug]
+labels: ["bug", "needs-triage"] 
 assignees: ["prakarsh-dt","vikramdevtron"]
 projects: ["Devtron Features Prioritization"]
 body:

.github/ISSUE_TEMPLATE/documentation.yaml

@@ -2,7 +2,7 @@ name: "📚 Documentation"
 description: "Report an issue related to documentation"
 assignees: ["ashokdevtron","prakarsh-dt"]
 title: "Doc: "
-labels: [documentation]
+labels: ["documentation", "needs-triage"]
 projects: ["Devtron Features Prioritization"]
 body:
   - type: markdown

.github/ISSUE_TEMPLATE/feature.yaml

@@ -1,7 +1,7 @@
 name: 🚀 Feature
 description: "Submit a proposal for a new feature"
 title: "Feature: "
-labels: ["enhancement"]
+labels: ["enhancement", "needs-triage"]
 assignees: ["prakarsh-dt","nishant-d","abhibhaw"]
 projects: ["Devtron Features Prioritization"]
 body:

.github/semantic.yml

@@ -11,3 +11,4 @@ types:
   - doc
   - release
   - misc
+  - sync

.github/workflows/pr-issue-validator.yaml

@@ -11,6 +11,7 @@ on:
       - 'main'
       - 'release-**'
       - 'develop'
+      - 'hotfix-v0**'
     # paths-ignore:
     #   - 'docs/**'
     #   - '.github/'
@@ -53,7 +54,7 @@ jobs:
 
         set -x    
         # Skip validation for documentation or chore PRs
-        if [[ "$TITLE" =~ ^(doc:|docs:|chore:|misc:) ]]; then
+        if [[ "$TITLE" =~ ^(doc:|docs:|chore:|misc:|Release:|release:|Sync:|sync:) ]]; then
           echo "Skipping validation for docs/chore PR."
           echo "PR NUMBER-: $PRNUM "
           gh pr edit $PRNUM --remove-label "PR:Issue-verification-failed"
@@ -140,32 +141,33 @@ jobs:
             --header "authorization: Bearer ${{ secrets.GH_PR_VALIDATOR_TOKEN }}" \
             "$issue_api_url"| jq '.state'|tr -d \")
           fi
-          echo "Issue Status: $issue_status"
-
+          echo "Issue Number : $issue_num Status: $issue_status"
           # Check if the issue is still open.
-          if [[ "$issue_status" == open ]]; then
-            echo "Issue #$issue_num is opened."
+          # if [[ "$issue_status" == open ]]; then
+            # echo "Issue #$issue_num is opened."
             if [[ $forked == true ]]; then
               echo "PR:Ready-to-Review, exiting gracefully"
               exit 0
             fi
             # Remove the 'Issue-verification-failed' label (if present) and add 'Ready-to-Review'.
             gh pr edit $PRNUM --remove-label "PR:Issue-verification-failed"
             gh pr edit $PRNUM --add-label "PR:Ready-to-Review"
-          else
-            echo "Issue #$issue_num is closed. Please link an open issue to proceed."
-              if [[ $forked == true ]]; then
-                echo "PR:Ready-to-Review, exiting gracefully"
-                exit 0
-              fi
+            echo "PR:Ready-to-Review, exiting gracefully"
+            exit 0
+          # else
+            # echo "Issue #$issue_num is closed. Please link an open issue to proceed."
+              # if [[ $forked == true ]]; then
+                # echo "PR:Ready-to-Review, exiting gracefully"
+                # exit 0
+              # fi
             # Add a comment to the PR indicating the issue is not linked correctly.
-            gh pr comment $PRNUM --body "PR is  linked to a closed issue. Please link an open issue to proceed."
+            # gh pr comment $PRNUM --body "PR is  linked to a closed issue. Please link an open issue to proceed."
 
             # Add the 'Issue-verification-failed' label and remove 'Ready-to-Review'.
-            gh pr edit $PRNUM --add-label "PR:Issue-verification-failed"
-            gh pr edit $PRNUM --remove-label "PR:Ready-to-Review"
-            exit 1
-          fi
+            # gh pr edit $PRNUM --add-label "PR:Issue-verification-failed"
+            # gh pr edit $PRNUM --remove-label "PR:Ready-to-Review"
+            # exit 1
+          #fi
         else
           echo "Issue not found. Invalid URL or issue number."
           # Add a comment to the PR indicating the issue is not linked correctly.

App.go

@@ -19,6 +19,7 @@ package main
 import (
 	"context"
 	"crypto/tls"
+	"errors"
 	"fmt"
 	"github.com/devtron-labs/common-lib/middlewares"
 	pubsub "github.com/devtron-labs/common-lib/pubsub-lib"
@@ -137,7 +138,7 @@ func (app *App) Start() {
 		err = server.ListenAndServe()
 	}
 	//err := http.ListenAndServe(fmt.Sprintf(":%d", port), auth.Authorizer(app.Enforcer, app.sessionManager)(app.MuxRouter.Router))
-	if err != nil {
+	if err != nil && !errors.Is(err, http.ErrServerClosed) {
 		app.Logger.Errorw("error in startup", "err", err)
 		os.Exit(2)
 	}

CHANGELOG/release-notes-v1.1.0.md

@@ -0,0 +1,53 @@
+## v1.1.0
+
+## Bugs
+- fix: Changes in labels of ref chart 4.20 (#6178)
+- fix: Fix cd-trigger-plugin (#6203)
+- fix: Bulk edit fix for global override (#6193)
+- fix: Panic handling for get workflow logs (#6168)
+- fix: User permissions not merging on same environments (#6167)
+- fix: Secret masking fix (#6136)
+- fix: Delete git repo without pipeline config (#6148)
+- fix: All modules installation fix (#6140)
+- fix: Update sql fix buildx (#6096)
+## Enhancements
+- feat: Support to trigger with same hash in CD trigger plugin  (#6205)
+- feat: Patch merge strategy for cm cs and dt (#6115)
+- feat: Adds Github actions to add the label using slash command (#6126)
+- feat: Fetch all non deprecated plugins in list (#6135)
+- feat: Node k8s permissions (#6123)
+- feat: App details refactoring (#6104)
+## Others
+- misc: Main sync develop 20dec (#6210)
+- misc: migration for mandatory tag (#6208)
+- chore: Read service for team (#6201)
+- chore: Oss ent triggerService changes (#6189)
+- misc: Release candidate v0.25.0 (#6194)
+- chore: Panic fix (#6188)
+- chore: Panic fix installed app read service (#6185)
+- chore: Runtime params variable refactorings (#6183)
+- misc: Asset for plugin (#6184)
+- chore: Updating deployment status start and end time (#6171)
+- misc: Main sync develop 16dec (#6182)
+- chore: Adding logs in deployment trigger flow (#6180)
+- misc: Added cd workflow runner read service (#6175)
+- misc: Added the token that contains the permissions to read the org members (#6164)
+- misc: Refactor-plugin-images migrations (#6108)
+- misc: Addign new plugins images (#6145)
+- misc: Updated authenticator to c3254b79e386 (#6144)
+- misc:  Adding pr validator for fork prs as gh command will not work (#6143)
+- misc: Adding validation for public repo (#6137)
+- misc: Update pull_request_template.md (#6134)
+- misc: Authenticator panic fix (#6131)
+- misc: Bulk update cm/cs name reference update fix (#6130)
+- misc: Cluster, project, environment read and beans (#6067)
+- chore: Use certificates data when InsecureSkipTLSVerify is false for a cluster in case of external run CI (#6100)
+- misc: main sync develop nov18 (#6107)
+- chore: Implemented Rbac enforcer in batch (#6103)
+- misc: Update pr-issue-validator.yaml (#6086)
+- misc: Sql query fixes (#6097)
+- misc: Kubecon 2024 oss sync (#6094)
+- chore: Depandabot fixes (#6070)
+- misc: Handler error while while helm deployment (#6082)
+
+

Dockerfile

@@ -1,52 +1,46 @@
 FROM golang:1.21 AS build-env
 
-RUN echo $GOPATH
-RUN apt update
-RUN apt install git gcc musl-dev make -y
-RUN go install github.com/google/wire/cmd/wire@latest
+RUN echo $GOPATH && \
+    apt update && \
+    apt install git gcc musl-dev make -y && \
+    go install github.com/google/wire/cmd/wire@latest
+    
 WORKDIR /go/src/github.com/devtron-labs/devtron
+
 ADD . /go/src/github.com/devtron-labs/devtron/
+
 ADD ./vendor/github.com/Microsoft/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/microsoft/
-RUN GOOS=linux make build-all
+
+RUN GOOS=linux make build
 
 # uncomment this post build arg
 FROM ubuntu:22.04@sha256:1b8d8ff4777f36f19bfe73ee4df61e3a0b789caeff29caa019539ec7c9a57f95 as  devtron-all
 
-RUN apt update
-RUN apt install ca-certificates git curl -y
-RUN apt clean autoclean
-RUN apt autoremove -y && rm -rf /var/lib/apt/lists/*
-COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/devtron .
-COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/auth_model.conf .
-#COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets
-COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/argocd-assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets
-COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/devtron-reference-helm-charts scripts/devtron-reference-helm-charts
-COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/sql scripts/sql
-COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/casbin scripts/casbin
-COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/argo-assets/APPLICATION_TEMPLATE.tmpl scripts/argo-assets/APPLICATION_TEMPLATE.tmpl
-
-COPY ./git-ask-pass.sh /git-ask-pass.sh
-RUN chmod +x /git-ask-pass.sh
-
-RUN useradd -ms /bin/bash devtron
-RUN chown -R devtron:devtron ./devtron
-RUN chown -R devtron:devtron ./git-ask-pass.sh
-RUN chown -R devtron:devtron ./auth_model.conf 
-RUN chown -R devtron:devtron ./scripts
+RUN apt update && \
+    apt install ca-certificates git curl -y && \
+    apt clean autoclean && \
+    apt autoremove -y && \
+    rm -rf /var/lib/apt/lists/* && \
+    useradd -ms /bin/bash devtron
 
-USER devtron
+COPY  --chown=devtron:devtron --from=build-env  /go/src/github.com/devtron-labs/devtron/devtron .
+
+COPY  --chown=devtron:devtron --from=build-env  /go/src/github.com/devtron-labs/devtron/auth_model.conf .
 
-CMD ["./devtron"]
+COPY --chown=devtron:devtron --from=build-env  /go/src/github.com/devtron-labs/devtron/argocd-assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets
 
+COPY --chown=devtron:devtron --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/devtron-reference-helm-charts scripts/devtron-reference-helm-charts
 
-#FROM alpine:3.15.0 as  devtron-ea
+COPY --chown=devtron:devtron --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/sql scripts/sql
 
-#RUN apk add --no-cache ca-certificates
-#COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/auth_model.conf .
-#COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/cmd/external-app/devtron-ea .
+COPY --chown=devtron:devtron --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/casbin scripts/casbin
 
-#COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets
-#COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/devtron-reference-helm-charts scripts/devtron-reference-helm-charts
-#COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/argo-assets/APPLICATION_TEMPLATE.JSON scripts/argo-assets/APPLICATION_TEMPLATE.JSON
+COPY --chown=devtron:devtron --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/argo-assets/APPLICATION_TEMPLATE.tmpl scripts/argo-assets/APPLICATION_TEMPLATE.tmpl
+
+COPY  --chown=devtron:devtron ./git-ask-pass.sh /git-ask-pass.sh
+
+RUN chmod +x /git-ask-pass.sh 
+
+USER devtron
 
-#CMD ["./devtron-ea"]
+CMD ["./devtron"]

DockerfileEA

@@ -1,33 +1,40 @@
 FROM golang:1.21  AS build-env
 
-RUN echo $GOPATH
-RUN apt update
-RUN apt install git gcc musl-dev make -y
-RUN go install github.com/google/wire/cmd/wire@latest
+RUN echo $GOPATH && \
+    apt update && \
+    apt install git gcc musl-dev make -y && \
+    go install github.com/google/wire/cmd/wire@latest
+
 WORKDIR /go/src/github.com/devtron-labs/devtron
+
 ADD . /go/src/github.com/devtron-labs/devtron/
+
 ADD ./vendor/github.com/Microsoft/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/microsoft/
+
 RUN GOOS=linux make build-all
 
 FROM ubuntu:22.04@sha256:1b8d8ff4777f36f19bfe73ee4df61e3a0b789caeff29caa019539ec7c9a57f95 as  devtron-ea
 
-RUN apt update
-RUN apt install ca-certificates curl -y
-RUN apt clean autoclean
-RUN apt autoremove -y && rm -rf /var/lib/apt/lists/*
-COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/auth_model.conf .
-COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/cmd/external-app/devtron-ea .
+RUN apt update && \
+    apt install ca-certificates curl -y && \
+    apt clean autoclean && \
+    apt autoremove -y && rm -rf /var/lib/apt/lists/* && \
+    useradd -ms /bin/bash devtron
+
+COPY --chown=devtron:devtron --from=build-env  /go/src/github.com/devtron-labs/devtron/auth_model.conf .
+
+COPY --chown=devtron:devtron --from=build-env  /go/src/github.com/devtron-labs/devtron/cmd/external-app/devtron-ea .
 
-#COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/argocd-assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets
+
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/devtron-reference-helm-charts scripts/devtron-reference-helm-charts
+
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/sql scripts/sql
+
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/casbin scripts/casbin
+
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/argo-assets/APPLICATION_TEMPLATE.tmpl scripts/argo-assets/APPLICATION_TEMPLATE.tmpl
 
-RUN useradd -ms /bin/bash devtron
-RUN chown -R devtron:devtron ./devtron-ea
-RUN chown -R devtron:devtron ./auth_model.conf
 RUN chown -R devtron:devtron ./scripts
 
 USER devtron