Skip to content

Commit e93cadb

Browse files
vikramdevtronvikramdevtron
authoredJan 6, 2025
Merge pull request #6256 from devtron-labs/main-sync-develop-6jan
sync: Main sync develop 6jan
·
v1.4.0v1.2.1
2 parents de8652b + d60c186 commit e93cadb

35 files changed

+345
-211
lines changed
 

Diff for: ‎.github/ISSUE_TEMPLATE/bug.yaml

+1-1
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:

Diff for: ‎.github/ISSUE_TEMPLATE/documentation.yaml

+1-1
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

Diff for: ‎.github/ISSUE_TEMPLATE/feature.yaml

+1-1
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:

Diff for: ‎.github/semantic.yml

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ types:
1111
- doc
1212
- release
1313
- misc
14+
- sync

Diff for: ‎.github/workflows/pr-issue-validator.yaml

+18-16
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:|Release:|release:) ]]; 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.

Diff for: ‎CHANGELOG/release-notes-v1.1.0.md

+53
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+

Diff for: ‎charts/devtron/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: devtron-operator
3-
appVersion: 1.0.1
3+
appVersion: 1.1.0
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.78
14+
version: 0.22.79
1515
sources:
1616
- https://github.com/devtron-labs/charts
1717
dependencies:

Diff for: ‎charts/devtron/devtron-bom.yaml

+12-12
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.0.1"
13+
release: "v1.1.0"
1414
registry: ""
1515
image: "inception"
1616
tag: "473deaa4-185-21582"
@@ -34,17 +34,17 @@ components:
3434
FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE: "true"
3535
ENABLE_RESOURCE_SCAN: "true"
3636
registry: ""
37-
image: "dashboard:7e7a0d0a-690-26996"
37+
image: "dashboard:a88790b2-690-27891"
3838
imagePullPolicy: IfNotPresent
3939
devtron:
4040
registry: ""
41-
image: "hyperion:50575235-280-27099"
42-
cicdImage: "devtron:50575235-434-27098"
41+
image: "hyperion:a109b8be-280-27896"
42+
cicdImage: "devtron:a109b8be-434-27906"
4343
imagePullPolicy: IfNotPresent
4444
customOverrides: {}
4545
ciRunner:
4646
registry: ""
47-
image: "ci-runner:3e71f258-138-27009"
47+
image: "ci-runner:54595cec-138-27894"
4848
argocdDexServer:
4949
registry: ""
5050
image: "dex:v2.30.2"
@@ -53,7 +53,7 @@ components:
5353
authenticator: "authenticator:e414faff-393-13273"
5454
kubelink:
5555
registry: ""
56-
image: "kubelink:73ce53e5-564-26855"
56+
image: "kubelink:6c0c7082-564-27862"
5757
imagePullPolicy: IfNotPresent
5858
configs:
5959
ENABLE_HELM_RELEASE_CACHE: "true"
@@ -71,7 +71,7 @@ components:
7171
keyName: postgresql-password
7272
kubewatch:
7373
registry: ""
74-
image: "kubewatch:b4888f54-419-26859"
74+
image: "kubewatch:33965457-419-27887"
7575
imagePullPolicy: IfNotPresent
7676
configs:
7777
devtroncd_NAMESPACE: "devtron-ci"
@@ -91,7 +91,7 @@ components:
9191
armImage: postgres_exporter:v0.10.1
9292
gitsensor:
9393
registry: ""
94-
image: "git-sensor:73ce53e5-200-26860"
94+
image: "git-sensor:6c0c7082-200-27863"
9595
imagePullPolicy: IfNotPresent
9696
serviceMonitor:
9797
enabled: false
@@ -109,7 +109,7 @@ components:
109109
# Values for lens
110110
lens:
111111
registry: ""
112-
image: "lens:b4888f54-333-26837"
112+
image: "lens:6c0c7082-333-27872"
113113
imagePullPolicy: IfNotPresent
114114
configs:
115115
GIT_SENSOR_PROTOCOL: GRPC
@@ -154,7 +154,7 @@ components:
154154
DB_NAME: "lens"
155155
chartSync:
156156
registry: ""
157-
image: chart-sync:73ce53e5-836-26871
157+
image: chart-sync:6c0c7082-836-27893
158158
schedule: "0 19 * * *"
159159
extraConfigs: {}
160160
# values for argocd integration
@@ -176,14 +176,14 @@ workflowController:
176176
IMDSv1ExecutorImage: "argoexec:v3.0.7"
177177
security:
178178
imageScanner:
179-
image: "image-scanner:d5458e1a-141-26846"
179+
image: "image-scanner:33965457-141-27892"
180180
clair:
181181
image:
182182
repository: clair
183183
tag: 4.3.6
184184
# Values for notifier integration
185185
notifier:
186-
image: "notifier:133c887d-372-26845"
186+
image: "notifier:2f9166d1-372-27880"
187187
minio:
188188
image: "minio:RELEASE.2021-02-14T04-01-33Z"
189189
mbImage: "minio-mc:RELEASE.2021-02-14T04-28-06Z"

Diff for: ‎charts/devtron/values.yaml

+12-12
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ global:
2424
extraManifests: []
2525
installer:
2626
repo: "devtron-labs/devtron"
27-
release: "v1.0.1"
27+
release: "v1.1.0"
2828
registry: ""
2929
image: inception
3030
tag: 473deaa4-185-21582
@@ -77,12 +77,12 @@ components:
7777
FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE: "true"
7878
ENABLE_RESOURCE_SCAN: "true"
7979
registry: ""
80-
image: "dashboard:7e7a0d0a-690-26996"
80+
image: "dashboard:a88790b2-690-27891"
8181
imagePullPolicy: IfNotPresent
8282
devtron:
8383
registry: ""
84-
image: "hyperion:50575235-280-27099"
85-
cicdImage: "devtron:50575235-434-27098"
84+
image: "hyperion:a109b8be-280-27896"
85+
cicdImage: "devtron:a109b8be-434-27906"
8686
imagePullPolicy: IfNotPresent
8787
customOverrides: {}
8888
serviceMonitor:
@@ -108,7 +108,7 @@ components:
108108
# - devtron.example.com
109109
ciRunner:
110110
registry: ""
111-
image: "ci-runner:3e71f258-138-27009"
111+
image: "ci-runner:54595cec-138-27894"
112112
argocdDexServer:
113113
registry: ""
114114
image: "dex:v2.30.2"
@@ -117,7 +117,7 @@ components:
117117
authenticator: "authenticator:e414faff-393-13273"
118118
kubelink:
119119
registry: ""
120-
image: "kubelink:73ce53e5-564-26855"
120+
image: "kubelink:6c0c7082-564-27862"
121121
imagePullPolicy: IfNotPresent
122122
configs:
123123
ENABLE_HELM_RELEASE_CACHE: "true"
@@ -135,7 +135,7 @@ components:
135135
keyName: postgresql-password
136136
kubewatch:
137137
registry: ""
138-
image: "kubewatch:b4888f54-419-26859"
138+
image: "kubewatch:33965457-419-27887"
139139
imagePullPolicy: IfNotPresent
140140
configs:
141141
devtroncd_NAMESPACE: "devtron-ci"
@@ -157,7 +157,7 @@ components:
157157
volumeSize: "20Gi"
158158
gitsensor:
159159
registry: ""
160-
image: "git-sensor:73ce53e5-200-26860"
160+
image: "git-sensor:6c0c7082-200-27863"
161161
imagePullPolicy: IfNotPresent
162162
serviceMonitor:
163163
enabled: false
@@ -175,7 +175,7 @@ components:
175175
# Values for lens
176176
lens:
177177
registry: ""
178-
image: "lens:b4888f54-333-26837"
178+
image: "lens:6c0c7082-333-27872"
179179
imagePullPolicy: IfNotPresent
180180
secrets: {}
181181
resources: {}
@@ -222,7 +222,7 @@ components:
222222
DB_NAME: "lens"
223223
chartSync:
224224
registry: ""
225-
image: chart-sync:73ce53e5-836-26871
225+
image: chart-sync:6c0c7082-836-27893
226226
schedule: "0 19 * * *"
227227
extraConfigs: {}
228228
# values for argocd integration
@@ -368,7 +368,7 @@ argo-cd:
368368
security:
369369
enabled: false
370370
imageScanner:
371-
image: "image-scanner:d5458e1a-141-26846"
371+
image: "image-scanner:33965457-141-27892"
372372
# Values for trivy
373373
trivy:
374374
enabled: false
@@ -383,7 +383,7 @@ security:
383383
notifier:
384384
enabled: false
385385
imagePullPolicy: IfNotPresent
386-
image: "notifier:133c887d-372-26845"
386+
image: "notifier:2f9166d1-372-27880"
387387
configs:
388388
CD_ENVIRONMENT: PROD
389389
DB: orchestrator

Diff for: ‎cmd/external-app/wire_gen.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.