Skip to content

Commit d19e788

Browse files
prkhrkatprkhrkat
committed
Merge branch 'develop' into mandatory-tag-v2
# Conflicts: # go.mod # go.sum # vendor/modules.txt
2 parents f023aa2 + d978a44 commit d19e788

File tree

279 files changed

+11668
-5730
lines changed

Some content is hidden

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

279 files changed

+11668
-5730
lines changed

‎.github/ISSUE_TEMPLATE/bug.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: "🐛 Bug Report"
22
description: "Submit a bug report to help us improve"
33
title: "Bug: "
4-
labels: [bug]
4+
labels: ["bug", "needs-triage"]
55
assignees: ["prakarsh-dt","vikramdevtron"]
66
projects: ["Devtron Features Prioritization"]
77
body:

‎.github/ISSUE_TEMPLATE/documentation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: "📚 Documentation"
22
description: "Report an issue related to documentation"
33
assignees: ["ashokdevtron","prakarsh-dt"]
44
title: "Doc: "
5-
labels: [documentation]
5+
labels: ["documentation", "needs-triage"]
66
projects: ["Devtron Features Prioritization"]
77
body:
88
- type: markdown

‎.github/ISSUE_TEMPLATE/feature.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: 🚀 Feature
22
description: "Submit a proposal for a new feature"
33
title: "Feature: "
4-
labels: ["enhancement"]
4+
labels: ["enhancement", "needs-triage"]
55
assignees: ["prakarsh-dt","nishant-d","abhibhaw"]
66
projects: ["Devtron Features Prioritization"]
77
body:

‎.github/semantic.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ types:
1111
- doc
1212
- release
1313
- misc
14+
- sync

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

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- 'main'
1212
- 'release-**'
1313
- 'develop'
14+
- 'hotfix-v0**'
1415
# paths-ignore:
1516
# - 'docs/**'
1617
# - '.github/'
@@ -53,7 +54,7 @@ jobs:
5354
5455
set -x
5556
# Skip validation for documentation or chore PRs
56-
if [[ "$TITLE" =~ ^(doc:|docs:|chore:|misc:) ]]; then
57+
if [[ "$TITLE" =~ ^(doc:|docs:|chore:|misc:|Release:|release:|Sync:|sync:) ]]; then
5758
echo "Skipping validation for docs/chore PR."
5859
echo "PR NUMBER-: $PRNUM "
5960
gh pr edit $PRNUM --remove-label "PR:Issue-verification-failed"
@@ -140,32 +141,33 @@ jobs:
140141
--header "authorization: Bearer ${{ secrets.GH_PR_VALIDATOR_TOKEN }}" \
141142
"$issue_api_url"| jq '.state'|tr -d \")
142143
fi
143-
echo "Issue Status: $issue_status"
144-
144+
echo "Issue Number : $issue_num Status: $issue_status"
145145
# Check if the issue is still open.
146-
if [[ "$issue_status" == open ]]; then
147-
echo "Issue #$issue_num is opened."
146+
# if [[ "$issue_status" == open ]]; then
147+
# echo "Issue #$issue_num is opened."
148148
if [[ $forked == true ]]; then
149149
echo "PR:Ready-to-Review, exiting gracefully"
150150
exit 0
151151
fi
152152
# Remove the 'Issue-verification-failed' label (if present) and add 'Ready-to-Review'.
153153
gh pr edit $PRNUM --remove-label "PR:Issue-verification-failed"
154154
gh pr edit $PRNUM --add-label "PR:Ready-to-Review"
155-
else
156-
echo "Issue #$issue_num is closed. Please link an open issue to proceed."
157-
if [[ $forked == true ]]; then
158-
echo "PR:Ready-to-Review, exiting gracefully"
159-
exit 0
160-
fi
155+
echo "PR:Ready-to-Review, exiting gracefully"
156+
exit 0
157+
# else
158+
# echo "Issue #$issue_num is closed. Please link an open issue to proceed."
159+
# if [[ $forked == true ]]; then
160+
# echo "PR:Ready-to-Review, exiting gracefully"
161+
# exit 0
162+
# fi
161163
# Add a comment to the PR indicating the issue is not linked correctly.
162-
gh pr comment $PRNUM --body "PR is linked to a closed issue. Please link an open issue to proceed."
164+
# gh pr comment $PRNUM --body "PR is linked to a closed issue. Please link an open issue to proceed."
163165

164166
# Add the 'Issue-verification-failed' label and remove 'Ready-to-Review'.
165-
gh pr edit $PRNUM --add-label "PR:Issue-verification-failed"
166-
gh pr edit $PRNUM --remove-label "PR:Ready-to-Review"
167-
exit 1
168-
fi
167+
# gh pr edit $PRNUM --add-label "PR:Issue-verification-failed"
168+
# gh pr edit $PRNUM --remove-label "PR:Ready-to-Review"
169+
# exit 1
170+
#fi
169171
else
170172
echo "Issue not found. Invalid URL or issue number."
171173
# Add a comment to the PR indicating the issue is not linked correctly.

‎App.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package main
1919
import (
2020
"context"
2121
"crypto/tls"
22+
"errors"
2223
"fmt"
2324
"github.com/devtron-labs/common-lib/middlewares"
2425
pubsub "github.com/devtron-labs/common-lib/pubsub-lib"
@@ -137,7 +138,7 @@ func (app *App) Start() {
137138
err = server.ListenAndServe()
138139
}
139140
//err := http.ListenAndServe(fmt.Sprintf(":%d", port), auth.Authorizer(app.Enforcer, app.sessionManager)(app.MuxRouter.Router))
140-
if err != nil {
141+
if err != nil && !errors.Is(err, http.ErrServerClosed) {
141142
app.Logger.Errorw("error in startup", "err", err)
142143
os.Exit(2)
143144
}

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

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

‎Dockerfile

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,46 @@
11
FROM golang:1.21 AS build-env
22

3-
RUN echo $GOPATH
4-
RUN apt update
5-
RUN apt install git gcc musl-dev make -y
6-
RUN go install github.com/google/wire/cmd/wire@latest
3+
RUN echo $GOPATH && \
4+
apt update && \
5+
apt install git gcc musl-dev make -y && \
6+
go install github.com/google/wire/cmd/wire@latest
7+
78
WORKDIR /go/src/github.com/devtron-labs/devtron
9+
810
ADD . /go/src/github.com/devtron-labs/devtron/
11+
912
ADD ./vendor/github.com/Microsoft/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/microsoft/
10-
RUN GOOS=linux make build-all
13+
14+
RUN GOOS=linux make build
1115

1216
# uncomment this post build arg
1317
FROM ubuntu:22.04@sha256:1b8d8ff4777f36f19bfe73ee4df61e3a0b789caeff29caa019539ec7c9a57f95 as devtron-all
1418

15-
RUN apt update
16-
RUN apt install ca-certificates git curl -y
17-
RUN apt clean autoclean
18-
RUN apt autoremove -y && rm -rf /var/lib/apt/lists/*
19-
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/devtron .
20-
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/auth_model.conf .
21-
#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
22-
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
23-
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/devtron-reference-helm-charts scripts/devtron-reference-helm-charts
24-
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/sql scripts/sql
25-
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/casbin scripts/casbin
26-
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/argo-assets/APPLICATION_TEMPLATE.tmpl scripts/argo-assets/APPLICATION_TEMPLATE.tmpl
27-
28-
COPY ./git-ask-pass.sh /git-ask-pass.sh
29-
RUN chmod +x /git-ask-pass.sh
30-
31-
RUN useradd -ms /bin/bash devtron
32-
RUN chown -R devtron:devtron ./devtron
33-
RUN chown -R devtron:devtron ./git-ask-pass.sh
34-
RUN chown -R devtron:devtron ./auth_model.conf
35-
RUN chown -R devtron:devtron ./scripts
19+
RUN apt update && \
20+
apt install ca-certificates git curl -y && \
21+
apt clean autoclean && \
22+
apt autoremove -y && \
23+
rm -rf /var/lib/apt/lists/* && \
24+
useradd -ms /bin/bash devtron
3625

37-
USER devtron
26+
COPY --chown=devtron:devtron --from=build-env /go/src/github.com/devtron-labs/devtron/devtron .
27+
28+
COPY --chown=devtron:devtron --from=build-env /go/src/github.com/devtron-labs/devtron/auth_model.conf .
3829

39-
CMD ["./devtron"]
30+
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
4031

32+
COPY --chown=devtron:devtron --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/devtron-reference-helm-charts scripts/devtron-reference-helm-charts
4133

42-
#FROM alpine:3.15.0 as devtron-ea
34+
COPY --chown=devtron:devtron --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/sql scripts/sql
4335

44-
#RUN apk add --no-cache ca-certificates
45-
#COPY --from=build-env /go/src/github.com/devtron-labs/devtron/auth_model.conf .
46-
#COPY --from=build-env /go/src/github.com/devtron-labs/devtron/cmd/external-app/devtron-ea .
36+
COPY --chown=devtron:devtron --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/casbin scripts/casbin
4737

48-
#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
49-
#COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/devtron-reference-helm-charts scripts/devtron-reference-helm-charts
50-
#COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/argo-assets/APPLICATION_TEMPLATE.JSON scripts/argo-assets/APPLICATION_TEMPLATE.JSON
38+
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
39+
40+
COPY --chown=devtron:devtron ./git-ask-pass.sh /git-ask-pass.sh
41+
42+
RUN chmod +x /git-ask-pass.sh
43+
44+
USER devtron
5145

52-
#CMD ["./devtron-ea"]
46+
CMD ["./devtron"]

‎DockerfileEA

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,40 @@
11
FROM golang:1.21 AS build-env
22

3-
RUN echo $GOPATH
4-
RUN apt update
5-
RUN apt install git gcc musl-dev make -y
6-
RUN go install github.com/google/wire/cmd/wire@latest
3+
RUN echo $GOPATH && \
4+
apt update && \
5+
apt install git gcc musl-dev make -y && \
6+
go install github.com/google/wire/cmd/wire@latest
7+
78
WORKDIR /go/src/github.com/devtron-labs/devtron
9+
810
ADD . /go/src/github.com/devtron-labs/devtron/
11+
912
ADD ./vendor/github.com/Microsoft/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/microsoft/
13+
1014
RUN GOOS=linux make build-all
1115

1216
FROM ubuntu:22.04@sha256:1b8d8ff4777f36f19bfe73ee4df61e3a0b789caeff29caa019539ec7c9a57f95 as devtron-ea
1317

14-
RUN apt update
15-
RUN apt install ca-certificates curl -y
16-
RUN apt clean autoclean
17-
RUN apt autoremove -y && rm -rf /var/lib/apt/lists/*
18-
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/auth_model.conf .
19-
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/cmd/external-app/devtron-ea .
18+
RUN apt update && \
19+
apt install ca-certificates curl -y && \
20+
apt clean autoclean && \
21+
apt autoremove -y && rm -rf /var/lib/apt/lists/* && \
22+
useradd -ms /bin/bash devtron
23+
24+
COPY --chown=devtron:devtron --from=build-env /go/src/github.com/devtron-labs/devtron/auth_model.conf .
25+
26+
COPY --chown=devtron:devtron --from=build-env /go/src/github.com/devtron-labs/devtron/cmd/external-app/devtron-ea .
2027

21-
#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
2228
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
29+
2330
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/devtron-reference-helm-charts scripts/devtron-reference-helm-charts
31+
2432
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/sql scripts/sql
33+
2534
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/casbin scripts/casbin
35+
2636
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/argo-assets/APPLICATION_TEMPLATE.tmpl scripts/argo-assets/APPLICATION_TEMPLATE.tmpl
2737

28-
RUN useradd -ms /bin/bash devtron
29-
RUN chown -R devtron:devtron ./devtron-ea
30-
RUN chown -R devtron:devtron ./auth_model.conf
3138
RUN chown -R devtron:devtron ./scripts
3239

3340
USER devtron

0 commit comments

Comments
 (0)