Skip to content

sync: Release candidate v0.30.0 #6427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Feb 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3d1457a
dependabot fix: upgraded to go-git/v5 v5.13.0
prkhrkat Feb 12, 2025
a926b42
dependabot fix: upgraded to go-git/v5 v5.13.2
prkhrkat Feb 12, 2025
0872935
when a helm app is managed by argocd then skip app updation when same…
prakash100198 Feb 12, 2025
b818952
Merge pull request #6388 from devtron-labs/dependa-12-feb
prkhrkat Feb 12, 2025
84043fd
code review changes:- deploymentConfigService
prakash100198 Feb 13, 2025
dafa9f2
Merge branch 'develop' into argo-cd-corrupt-data-fix
prakash100198 Feb 13, 2025
1aed5f4
fix
prakash100198 Feb 13, 2025
25b36cf
main sync develop
vikramdevtron Feb 13, 2025
f390af5
Merge pull request #6396 from devtron-labs/main-sync-develop-13feb
vikramdevtron Feb 13, 2025
900968f
removed deprecated flag:- UseDeploymentConfigData
prakash100198 Feb 14, 2025
d2813c8
Merge branch 'develop' into argo-cd-corrupt-data-fix
prakash100198 Feb 14, 2025
08fa6d6
Merge pull request #6390 from devtron-labs/argo-cd-corrupt-data-fix
prakash100198 Feb 14, 2025
3625c5a
handle panic in GetCiPipelineById
prakash100198 Feb 18, 2025
e15611c
Merge pull request #6405 from devtron-labs/base-update
kirandevtn Feb 20, 2025
fa14d98
fix: pipeline listing in app Group
prkhrkat Feb 20, 2025
bd9d4f7
Merge pull request #6410 from devtron-labs/fix-sub-user
prkhrkat Feb 20, 2025
8e1dc54
Merge branch 'develop' into panic-fixes-1
prakash100198 Feb 20, 2025
7141702
feat: hibernate devtron app (#6356)
RajeevRanjan27 Feb 20, 2025
251cce8
Merge branch 'develop' into panic-fixes-1
prakash100198 Feb 21, 2025
3ca6dad
Merge pull request #6411 from devtron-labs/panic-fixes-1
prakash100198 Feb 21, 2025
1642706
main sync develop
vikramdevtron Feb 24, 2025
840715d
vendor update 24 feb
vikramdevtron Feb 24, 2025
39e45ec
Merge pull request #6415 from devtron-labs/main-sync-develop-24feb
vikramdevtron Feb 24, 2025
757ff4c
main sync rc30
vikramdevtron Feb 27, 2025
ca52511
vendor update in rc30
vikramdevtron Feb 27, 2025
3b9a56b
Merge pull request #6426 from devtron-labs/main-sync-rc30
vikramdevtron Feb 28, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ADD ./vendor/github.com/Microsoft/ /go/src/github.com/devtron-labs/devtron/vendo
RUN GOOS=linux make build

# uncomment this post build arg
FROM ubuntu:22.04@sha256:1b8d8ff4777f36f19bfe73ee4df61e3a0b789caeff29caa019539ec7c9a57f95 as devtron-all
FROM ubuntu:24.04@sha256:72297848456d5d37d1262630108ab308d3e9ec7ed1c3286a32fe09856619a782 as devtron-all

RUN apt update && \
apt install ca-certificates git curl -y && \
Expand Down Expand Up @@ -43,4 +43,4 @@ RUN chmod +x /git-ask-pass.sh

USER devtron

CMD ["./devtron"]
CMD ["./devtron"]
2 changes: 1 addition & 1 deletion DockerfileEA
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ADD ./vendor/github.com/Microsoft/ /go/src/github.com/devtron-labs/devtron/vendo

RUN GOOS=linux make build-all

FROM ubuntu:22.04@sha256:1b8d8ff4777f36f19bfe73ee4df61e3a0b789caeff29caa019539ec7c9a57f95 as devtron-ea
FROM ubuntu:24.04@sha256:72297848456d5d37d1262630108ab308d3e9ec7ed1c3286a32fe09856619a782 as devtron-ea

RUN apt update && \
apt install ca-certificates curl -y && \
Expand Down
6 changes: 3 additions & 3 deletions Wire.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ import (
"github.com/devtron-labs/devtron/pkg/build"
"github.com/devtron-labs/devtron/pkg/build/artifacts/imageTagging"
pipeline6 "github.com/devtron-labs/devtron/pkg/build/pipeline"
"github.com/devtron-labs/devtron/pkg/bulkAction"
"github.com/devtron-labs/devtron/pkg/bulkAction/service"
"github.com/devtron-labs/devtron/pkg/chart"
"github.com/devtron-labs/devtron/pkg/chart/gitOpsConfig"
chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
Expand Down Expand Up @@ -357,8 +357,8 @@ func InitializeApp() (*App, error) {
wire.Bind(new(gitOpsConfig.DevtronAppGitOpConfigService), new(*gitOpsConfig.DevtronAppGitOpConfigServiceImpl)),
chart.NewChartServiceImpl,
wire.Bind(new(chart.ChartService), new(*chart.ChartServiceImpl)),
bulkAction.NewBulkUpdateServiceImpl,
wire.Bind(new(bulkAction.BulkUpdateService), new(*bulkAction.BulkUpdateServiceImpl)),
service.NewBulkUpdateServiceImpl,
wire.Bind(new(service.BulkUpdateService), new(*service.BulkUpdateServiceImpl)),

repository.NewImageTagRepository,
wire.Bind(new(repository.ImageTagRepository), new(*repository.ImageTagRepositoryImpl)),
Expand Down
6 changes: 3 additions & 3 deletions api/deployment/DeploymentConfigRestHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func (handler *DeploymentConfigRestHandlerImpl) CreateChartFromFile(w http.Respo
}

token := r.Header.Get("token")
if ok := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionUpdate, "*"); !ok {
if ok := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*"); !ok {
common.WriteJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
return
}
Expand Down Expand Up @@ -177,7 +177,7 @@ func (handler *DeploymentConfigRestHandlerImpl) SaveChart(w http.ResponseWriter,
}

token := r.Header.Get("token")
if ok := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionDelete, "*"); !ok {
if ok := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*"); !ok {
common.WriteJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
return
}
Expand Down Expand Up @@ -234,7 +234,7 @@ func (handler *DeploymentConfigRestHandlerImpl) DownloadChart(w http.ResponseWri
}

token := r.Header.Get("token")
if ok := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionUpdate, "*"); !ok {
if ok := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionGet, "*"); !ok {
common.WriteJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
return
}
Expand Down
71 changes: 31 additions & 40 deletions api/restHandler/BulkUpdateRestHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import (
"fmt"
"github.com/devtron-labs/devtron/pkg/build/git/gitMaterial/repository"
"github.com/devtron-labs/devtron/pkg/build/git/gitProvider"
"github.com/devtron-labs/devtron/pkg/bulkAction/bean"
"github.com/devtron-labs/devtron/pkg/bulkAction/service"
"github.com/devtron-labs/devtron/pkg/cluster/environment"
"net/http"
"strconv"
Expand All @@ -34,7 +36,6 @@ import (
"github.com/devtron-labs/devtron/pkg/appWorkflow"
"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
"github.com/devtron-labs/devtron/pkg/auth/user"
"github.com/devtron-labs/devtron/pkg/bulkAction"
"github.com/devtron-labs/devtron/pkg/chart"
"github.com/devtron-labs/devtron/pkg/pipeline"
"github.com/devtron-labs/devtron/pkg/team"
Expand All @@ -61,7 +62,7 @@ type BulkUpdateRestHandlerImpl struct {
ciPipelineRepository pipelineConfig.CiPipelineRepository
ciHandler pipeline.CiHandler
logger *zap.SugaredLogger
bulkUpdateService bulkAction.BulkUpdateService
bulkUpdateService service.BulkUpdateService
chartService chart.ChartService
propertiesConfigService pipeline.PropertiesConfigService
userAuthService user.UserService
Expand All @@ -81,7 +82,7 @@ type BulkUpdateRestHandlerImpl struct {
}

func NewBulkUpdateRestHandlerImpl(pipelineBuilder pipeline.PipelineBuilder, logger *zap.SugaredLogger,
bulkUpdateService bulkAction.BulkUpdateService,
bulkUpdateService service.BulkUpdateService,
chartService chart.ChartService,
propertiesConfigService pipeline.PropertiesConfigService,
userAuthService user.UserService,
Expand Down Expand Up @@ -135,7 +136,7 @@ func (handler BulkUpdateRestHandlerImpl) FindBulkUpdateReadme(w http.ResponseWri
return
}
//auth free, only login required
var responseArr []*bulkAction.BulkUpdateSeeExampleResponse
var responseArr []*bean.BulkUpdateSeeExampleResponse
responseArr = append(responseArr, response)
common.WriteJsonResp(w, nil, responseArr, http.StatusOK)
}
Expand All @@ -157,7 +158,7 @@ func (handler BulkUpdateRestHandlerImpl) CheckAuthForImpactedObjects(AppId int,
}
func (handler BulkUpdateRestHandlerImpl) GetImpactedAppsName(w http.ResponseWriter, r *http.Request) {
decoder := json.NewDecoder(r.Body)
var script bulkAction.BulkUpdateScript
var script bean.BulkUpdateScript
err := decoder.Decode(&script)
if err != nil {
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
Expand Down Expand Up @@ -212,7 +213,7 @@ func (handler BulkUpdateRestHandlerImpl) CheckAuthForBulkUpdate(AppId int, EnvId
}
func (handler BulkUpdateRestHandlerImpl) BulkUpdate(w http.ResponseWriter, r *http.Request) {
decoder := json.NewDecoder(r.Body)
var script bulkAction.BulkUpdateScript
var script bean.BulkUpdateScript
err := decoder.Decode(&script)
if err != nil {
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
Expand Down Expand Up @@ -255,65 +256,55 @@ func (handler BulkUpdateRestHandlerImpl) BulkUpdate(w http.ResponseWriter, r *ht
}

func (handler BulkUpdateRestHandlerImpl) BulkHibernate(w http.ResponseWriter, r *http.Request) {
userId, err := handler.userAuthService.GetLoggedInUser(r)
if userId == 0 || err != nil {
common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
return
}
decoder := json.NewDecoder(r.Body)
var request bulkAction.BulkApplicationForEnvironmentPayload
err = decoder.Decode(&request)
if err != nil {
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
return
}
request.UserId = userId
err = handler.validator.Struct(request)
request, err := handler.decodeAndValidateBulkRequest(w, r)
if err != nil {
handler.logger.Errorw("validation err", "err", err, "request", request)
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
return
return // response already written by the helper on error.
}

token := r.Header.Get("token")
response, err := handler.bulkUpdateService.BulkHibernate(&request, r.Context(), w, token, handler.checkAuthForBulkHibernateAndUnhibernate)
response, err := handler.bulkUpdateService.BulkHibernate(request, r.Context(), w, token, handler.checkAuthForBulkHibernateAndUnhibernate)
if err != nil {
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
return
}
common.WriteJsonResp(w, nil, response, http.StatusOK)
}

func (handler BulkUpdateRestHandlerImpl) BulkUnHibernate(w http.ResponseWriter, r *http.Request) {
// decodeAndValidateBulkRequest is a helper to decode and validate the request.
func (handler BulkUpdateRestHandlerImpl) decodeAndValidateBulkRequest(w http.ResponseWriter, r *http.Request) (*bean.BulkApplicationForEnvironmentPayload, error) {
userId, err := handler.userAuthService.GetLoggedInUser(r)
if userId == 0 || err != nil {
common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
return
return nil, err
}

decoder := json.NewDecoder(r.Body)
var request bulkAction.BulkApplicationForEnvironmentPayload
err = decoder.Decode(&request)
if err != nil {
var request bean.BulkApplicationForEnvironmentPayload
if err = decoder.Decode(&request); err != nil {
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
return
return nil, err
}
request.UserId = userId
err = handler.validator.Struct(request)
if err != nil {
handler.logger.Errorw("validation err", "err", err, "request", request)
if err = handler.validator.Struct(request); err != nil {
handler.logger.Errorw("validation error", "request", request, "err", err)
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
return
return nil, err
}
return &request, nil
}

func (handler BulkUpdateRestHandlerImpl) BulkUnHibernate(w http.ResponseWriter, r *http.Request) {
request, err := handler.decodeAndValidateBulkRequest(w, r)
if err != nil {
return // response already written by the helper on error.
}
token := r.Header.Get("token")
response, err := handler.bulkUpdateService.BulkUnHibernate(&request, r.Context(), w, token, handler.checkAuthForBulkHibernateAndUnhibernate)
response, err := handler.bulkUpdateService.BulkUnHibernate(request, r.Context(), w, token, handler.checkAuthForBulkHibernateAndUnhibernate)
if err != nil {
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
return
}
common.WriteJsonResp(w, nil, response, http.StatusOK)
}

func (handler BulkUpdateRestHandlerImpl) BulkDeploy(w http.ResponseWriter, r *http.Request) {
token := r.Header.Get("token")
userId, err := handler.userAuthService.GetLoggedInUser(r)
Expand All @@ -322,7 +313,7 @@ func (handler BulkUpdateRestHandlerImpl) BulkDeploy(w http.ResponseWriter, r *ht
return
}
decoder := json.NewDecoder(r.Body)
var request bulkAction.BulkApplicationForEnvironmentPayload
var request bean.BulkApplicationForEnvironmentPayload
err = decoder.Decode(&request)
if err != nil {
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
Expand Down Expand Up @@ -350,7 +341,7 @@ func (handler BulkUpdateRestHandlerImpl) BulkBuildTrigger(w http.ResponseWriter,
return
}
decoder := json.NewDecoder(r.Body)
var request bulkAction.BulkApplicationForEnvironmentPayload
var request bean.BulkApplicationForEnvironmentPayload
err = decoder.Decode(&request)
if err != nil {
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
Expand Down Expand Up @@ -399,7 +390,7 @@ func (handler BulkUpdateRestHandlerImpl) HandleCdPipelineBulkAction(w http.Respo
common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
return
}
var cdPipelineBulkActionReq bulkAction.CdBulkActionRequestDto
var cdPipelineBulkActionReq bean.CdBulkActionRequestDto
err = decoder.Decode(&cdPipelineBulkActionReq)
cdPipelineBulkActionReq.UserId = userId
if err != nil {
Expand Down
4 changes: 1 addition & 3 deletions api/restHandler/ReleaseMetricsRestHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,10 @@ func (impl *ReleaseMetricsRestHandlerImpl) ResetDataForAllAppEnvironment(w http.
}
}

// err := decoder.Decode(&employeeStruct, r.URL.Query())
var decoder = schema.NewDecoder()

func (impl *ReleaseMetricsRestHandlerImpl) GetDeploymentMetrics(w http.ResponseWriter, r *http.Request) {
//decoder := json.NewDecoder(r.Body)
metricRequest := &lens.MetricRequest{}
decoder := schema.NewDecoder()
err := decoder.Decode(metricRequest, r.URL.Query())
if err != nil {
impl.logger.Errorw("request err, GetDeploymentMetrics", "err", err, "payload", metricRequest)
Expand Down
2 changes: 2 additions & 0 deletions api/router/BulkUpdateRouter.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ func (router BulkUpdateRouterImpl) initBulkUpdateRouter(bulkRouter *mux.Router)

bulkRouter.Path("/v1beta1/hibernate").HandlerFunc(router.restHandler.BulkHibernate).Methods("POST")
bulkRouter.Path("/v1beta1/unhibernate").HandlerFunc(router.restHandler.BulkUnHibernate).Methods("POST")
bulkRouter.Path("/v1beta2/hibernate").HandlerFunc(router.restHandler.BulkHibernate).Methods("POST")
bulkRouter.Path("/v1beta2/unhibernate").HandlerFunc(router.restHandler.BulkUnHibernate).Methods("POST")
bulkRouter.Path("/v1beta1/deploy").HandlerFunc(router.restHandler.BulkDeploy).Methods("POST")
bulkRouter.Path("/v1beta1/build").HandlerFunc(router.restHandler.BulkBuildTrigger).Methods("POST")
bulkRouter.Path("/v1beta1/cd-pipeline").HandlerFunc(router.restHandler.HandleCdPipelineBulkAction).Methods("POST")
Expand Down
1 change: 1 addition & 0 deletions api/router/app/pipeline/trigger/PipelineTriggerRouter.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ func (router PipelineTriggerRouterImpl) InitPipelineTriggerRouter(pipelineTrigge
pipelineTriggerRouter.Path("/update-release-status").HandlerFunc(router.restHandler.ReleaseStatusUpdate).Methods("POST")
pipelineTriggerRouter.Path("/rotate-pods").HandlerFunc(router.restHandler.RotatePods).Methods("POST")
pipelineTriggerRouter.Path("/stop-start-app").HandlerFunc(router.restHandler.StartStopApp).Methods("POST")
pipelineTriggerRouter.Path("/alpha1/stop-start-app").HandlerFunc(router.restHandler.StartStopApp).Methods("POST")
pipelineTriggerRouter.Path("/stop-start-dg").HandlerFunc(router.restHandler.StartStopDeploymentGroup).Methods("POST")
pipelineTriggerRouter.Path("/release/").
Handler(sse2.SubscribeHandler(sse.Broker, PollTopic, fetchReleaseData)).
Expand Down
36 changes: 18 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ require (
github.com/evanphx/json-patch v5.7.0+incompatible
github.com/gammazero/workerpool v1.1.3
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/go-git/go-billy/v5 v5.5.0
github.com/go-git/go-git/v5 v5.11.0
github.com/go-git/go-billy/v5 v5.6.2
github.com/go-git/go-git/v5 v5.13.2
github.com/go-pg/pg v6.15.1+incompatible
github.com/go-resty/resty/v2 v2.7.0
github.com/gogo/protobuf v1.3.2
Expand Down Expand Up @@ -59,7 +59,7 @@ require (
github.com/prometheus/client_golang v1.16.0
github.com/robfig/cron/v3 v3.0.1
github.com/satori/go.uuid v1.2.0
github.com/stretchr/testify v1.8.4
github.com/stretchr/testify v1.10.0
github.com/tidwall/gjson v1.14.4
github.com/tidwall/sjson v1.2.4
github.com/xanzy/go-gitlab v0.107.0
Expand All @@ -74,9 +74,9 @@ require (
go.opentelemetry.io/otel/sdk v1.20.0
go.opentelemetry.io/otel/trace v1.20.0
go.uber.org/zap v1.21.0
golang.org/x/crypto v0.31.0
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
golang.org/x/mod v0.17.0
golang.org/x/crypto v0.32.0
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
golang.org/x/mod v0.19.0
golang.org/x/oauth2 v0.21.0
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d
google.golang.org/grpc v1.59.0
Expand Down Expand Up @@ -116,7 +116,7 @@ require (
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
github.com/ProtonMail/go-crypto v1.1.5 // indirect
github.com/agext/levenshtein v1.2.1 // indirect
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/apparentlymart/go-textseg v1.0.0 // indirect
Expand All @@ -132,7 +132,7 @@ require (
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/cli v24.0.6+incompatible // indirect
Expand Down Expand Up @@ -215,20 +215,20 @@ require (
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pjbgf/sha1cd v0.3.2 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/redis/go-redis/v9 v9.0.5 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sergi/go-diff v1.2.0 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/skeema/knownhosts v1.2.2 // indirect
github.com/skeema/knownhosts v1.3.0 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/syndtr/goleveldb v1.0.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
Expand All @@ -247,13 +247,13 @@ require (
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
golang.org/x/tools v0.23.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.126.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
Expand Down Expand Up @@ -288,8 +288,8 @@ require gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect

replace (
github.com/argoproj/argo-workflows/v3 v3.5.10 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250213085216-b49895a5c8c4
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213085216-b49895a5c8c4
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250225082115-9384f9d0b86c
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250225082115-9384f9d0b86c
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
k8s.io/api => k8s.io/api v0.29.7
Expand Down
Loading