Skip to content

Commit bf44193

Browse files
vikramdevtronvikramdevtron
authored
Merge pull request #6558 from devtron-labs/main-sync-rc-8may
sync: Main sync RC
2 parents c0d3426 + c78e56e commit bf44193

File tree

6 files changed

+30
-18
lines changed

6 files changed

+30
-18
lines changed

‎.github/workflows/auto-label.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Devtron-auto-labeller
1+
name: Devtron-auto-labeler
22

33
on:
44
issue_comment:
@@ -25,11 +25,11 @@ jobs:
2525
ISSUE_NUMBER=$(jq -r '.issue.number // .pull_request.number' "$GITHUB_EVENT_PATH")
2626
COMMENT_AUTHOR=$(jq -r '.comment.user.login' "$GITHUB_EVENT_PATH")
2727
28-
ORG_NAME="satyam-tests"
28+
ORG_NAME="devtron-labs"
2929
3030
# Check if the person is authorized to add labels
31-
curl -s -H "Authorization: token $GH_TOKEN" "https://api.github.com/orgs/$ORG_NAME/members/$COMMENT_AUTHOR" > /dev/null
32-
if [[ $? -ne 0 ]]; then
31+
RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GH_TOKEN" "https://api.github.com/orgs/$ORG_NAME/members/$COMMENT_AUTHOR")
32+
if [[ "$RESPONSE" -ne 204 ]]; then
3333
gh issue comment "$ISSUE_NUMBER" --body "Hi @$COMMENT_AUTHOR, you must be a member of the organization '$ORG_NAME' to add or remove labels."
3434
echo "User '$COMMENT_AUTHOR' is not a member of the organization '$ORG_NAME'. Exiting."
3535
exit 1
@@ -53,7 +53,7 @@ jobs:
5353
fi
5454
fi
5555
56-
# Remove Label Logic
56+
# Removes Label Logic
5757
if [[ "$COMMENT_BODY" =~ ^/remove[[:space:]](.+)$ ]]; then
5858
LABEL_NAME_TO_REMOVE=$(echo "$COMMENT_BODY" | sed -n 's|/remove ||p')
5959
@@ -64,4 +64,4 @@ jobs:
6464
else
6565
echo "The label '$LABEL_NAME_TO_REMOVE' is not attached to issue #$ISSUE_NUMBER."
6666
fi
67-
fi
67+
fi

‎charts/devtron/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ keywords:
1111
- argocd
1212
- Hyperion
1313
engine: gotpl
14-
version: 0.22.90
14+
version: 0.22.91
1515
sources:
1616
- https://github.com/devtron-labs/charts
1717
dependencies:

‎charts/devtron/templates/configmap-secret.yaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,4 +376,16 @@ data:
376376
{{- end }}
377377
{{- end }}
378378
{{- end }}
379-
{{- end }}
379+
{{- end }}
380+
{{- if $.Values.devtronEnterprise.enabled }}
381+
---
382+
apiVersion: v1
383+
data:
384+
{{- if or $.Values.UCID $.Values.ucid }}
385+
UCID: {{ $.Values.UCID | default $.Values.ucid }}
386+
{{- end }}
387+
kind: ConfigMap
388+
metadata:
389+
name: devtron-ucid
390+
namespace: devtroncd
391+
{{- end }}

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ require (
307307

308308
replace (
309309
github.com/argoproj/argo-workflows/v3 v3.5.13 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
310-
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250504171511-cdbe7937e3ce
311-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce
310+
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250507060105-0a50d1fb1d87
311+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250507060105-0a50d1fb1d87
312312
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
313313
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
314314
k8s.io/api => k8s.io/api v0.29.7

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -829,10 +829,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
829829
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
830830
github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU=
831831
github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
832-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250504171511-cdbe7937e3ce h1:nOtGeg79z6NtyoGofOp9/5T1HZ2JA51sEMTgwz2CS1o=
833-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250504171511-cdbe7937e3ce/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
834-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce h1:U/TOmo1tqQVliypXwEtVStpzZo19hjNm4SEUR9FrTXM=
835-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
832+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250507060105-0a50d1fb1d87 h1:NFTsfTiKgd/slAOeFgzgdCYuwLhJ5AI+V77jugQqvmw=
833+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250507060105-0a50d1fb1d87/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
834+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250507060105-0a50d1fb1d87 h1:2JMHVB3eYBeukA0qIw7L9bvRn3o8vmxcVtQGAr94rxE=
835+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250507060105-0a50d1fb1d87/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
836836
github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
837837
github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
838838
github.com/devtron-labs/protos v0.0.3-0.20250323220609-ecf8a0f7305e h1:U6UdYbW8a7xn5IzFPd8cywjVVPfutGJCudjePAfL/Hs=

‎vendor/modules.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -472,15 +472,15 @@ github.com/davecgh/go-spew/spew
472472
# github.com/deckarep/golang-set v1.8.0
473473
## explicit; go 1.17
474474
github.com/deckarep/golang-set
475-
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250504171511-cdbe7937e3ce
475+
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250507060105-0a50d1fb1d87
476476
## explicit; go 1.21
477477
github.com/devtron-labs/authenticator/apiToken
478478
github.com/devtron-labs/authenticator/client
479479
github.com/devtron-labs/authenticator/jwt
480480
github.com/devtron-labs/authenticator/middleware
481481
github.com/devtron-labs/authenticator/oidc
482482
github.com/devtron-labs/authenticator/password
483-
# 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
483+
# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250507060105-0a50d1fb1d87
484484
## explicit; go 1.21
485485
github.com/devtron-labs/common-lib/async
486486
github.com/devtron-labs/common-lib/blob-storage
@@ -2352,8 +2352,8 @@ xorm.io/xorm/log
23522352
xorm.io/xorm/names
23532353
xorm.io/xorm/schemas
23542354
xorm.io/xorm/tags
2355-
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250504171511-cdbe7937e3ce
2356-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250504171511-cdbe7937e3ce
2355+
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250507060105-0a50d1fb1d87
2356+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250507060105-0a50d1fb1d87
23572357
# github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
23582358
# github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
23592359
# k8s.io/api => k8s.io/api v0.29.7

0 commit comments

Comments
 (0)