Merge pull request #6897 from devtron-labs/chore/main-sync-17-dec

chore: Merge branch 'origin/main' into 'release-candidate-v0.44.0'

Author: Ash-exp

go.mod

@@ -338,7 +338,7 @@ require (
 replace (
 	github.com/argoproj/argo-workflows/v3 v3.5.13 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
 	github.com/cyphar/filepath-securejoin v0.4.1 => github.com/cyphar/filepath-securejoin v0.3.6 // indirect
-	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20251208115626-248c2710ef2f
-	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20251208115626-248c2710ef2f
+	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20251217072923-a2f0562a9b35
+	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20251217072923-a2f0562a9b35
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1
 )

go.sum

@@ -237,10 +237,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-20251208115626-248c2710ef2f h1:SLApp7oIXxV9MLN3smAeRGkMo5zIAqGJhUdzXeOKbcU=
-github.com/devtron-labs/devtron-services/authenticator v0.0.0-20251208115626-248c2710ef2f/go.mod h1:9LCkYfiWaEKIBkmxw9jX1GujvEMyHwmDtVsatffAkeU=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20251208115626-248c2710ef2f h1:YFBtZIrYbc1/OCTMngMp5Xu2E3w24qSjc8+C0BEmwFQ=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20251208115626-248c2710ef2f/go.mod h1:CqHnvltrng2O40hNGVl56qcAhv7tiXK3SKx47LKyE/A=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20251217072923-a2f0562a9b35 h1:RUzuJvbT4d8bE94GTl9TbP5h3H5iA2RAPJJt9ip0n1c=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20251217072923-a2f0562a9b35/go.mod h1:9LCkYfiWaEKIBkmxw9jX1GujvEMyHwmDtVsatffAkeU=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20251217072923-a2f0562a9b35 h1:hEVPoB3ndscqPxZUVGDj9PU8AMjYrCTiie9YnsMNRnE=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20251217072923-a2f0562a9b35/go.mod h1:CqHnvltrng2O40hNGVl56qcAhv7tiXK3SKx47LKyE/A=
 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=

pkg/deployment/trigger/devtronApps/userDeploymentRequest/repository/UserDeploymentRequestRepository.go

@@ -48,8 +48,9 @@ type UserDeploymentRequest struct {
 
 type UserDeploymentRequestWithAdditionalFields struct {
 	UserDeploymentRequest
-	CdWorkflowRunnerId int `sql:"cd_workflow_runner_id"`
-	PipelineOverrideId int `sql:"pipeline_override_id"`
+	tableName          struct{} `sql:"user_deployment_request" pg:",discard_unknown_columns"`
+	CdWorkflowRunnerId int      `sql:"cd_workflow_runner_id"`
+	PipelineOverrideId int      `sql:"pipeline_override_id"`
 }
 
 type UserDeploymentRequestRepository interface {

scripts/devtron-reference-helm-charts/deployment-chart_4-22-0/.helmignore

@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

scripts/devtron-reference-helm-charts/deployment-chart_4-22-0/.image_descriptor_template.json

@@ -0,0 +1 @@
+{"server":{"deployment":{"image_tag":"{{.Tag}}","image":"{{.Name}}"}},"pipelineName": "{{.PipelineName}}","releaseVersion":"{{.ReleaseVersion}}","deploymentType": "{{.DeploymentType}}", "app": "{{.App}}", "env": "{{.Env}}", "appMetrics": {{.AppMetrics}}}

scripts/devtron-reference-helm-charts/deployment-chart_4-22-0/Chart.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: deployment-chart_4-22-0
+version: 4.22.0