Skip to content

sync: Release candidate v0.34.0 #6539

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 56 commits into from
Apr 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
2517961
refactor
prkhrkat Apr 2, 2025
de43a47
refactor
prkhrkat Apr 2, 2025
31cdfec
fix for Hibernating Filter
prkhrkat Apr 3, 2025
39f98db
Merge branch 'develop' into hibernated-fix
prkhrkat Apr 3, 2025
63b37ed
fix for Hibernating Filter
prkhrkat Apr 3, 2025
02a3d61
fix for Hibernating Filter
prkhrkat Apr 3, 2025
89109d3
fix for Hibernating Filter
prkhrkat Apr 3, 2025
cf86d19
fix for Hibernating Filter
prkhrkat Apr 3, 2025
15270c2
updtae the descriptions of env variables
Apr 6, 2025
315c6b5
GetAppMetadataListByEnvironment
prkhrkat Apr 8, 2025
58d7555
Merge branch 'develop' into hibernated-fix
prkhrkat Apr 8, 2025
7b9cc28
GetAppMetadataListByEnvironment
prkhrkat Apr 8, 2025
764a34d
GetAppMetadataListByEnvironment
prkhrkat Apr 9, 2025
430a65e
GetAppMetadataListByEnvironment
prkhrkat Apr 9, 2025
3cd0abb
GetAppMetadataListByEnvironment
prkhrkat Apr 9, 2025
2598130
GetAppMetadataListByEnvironment
prkhrkat Apr 9, 2025
b0c54b9
GetAppMetadataListByEnvironment
prkhrkat Apr 9, 2025
ba51241
env_gen.md changes
prkhrkat Apr 9, 2025
28ff909
fix: postgresql skip unique constraints error and handle network conn…
Ash-exp Apr 9, 2025
66f64e5
Merge pull request #6509 from devtron-labs/fix-pg-query-matrices
Ash-exp Apr 10, 2025
7a36320
Merge branch 'hibernated-fix' into hibernated-fix-refact
prkhrkat Apr 10, 2025
8f9a837
query fix
prkhrkat Apr 10, 2025
ed42b5d
update the config file
neha130 Apr 10, 2025
2665345
update the config file
neha130 Apr 10, 2025
3fe399f
Merge branch 'develop' into update_config_file
prakash100198 Apr 10, 2025
1a4a38b
env gen update
prakash100198 Apr 10, 2025
bd387d8
Merge pull request #6499 from devtron-labs/update_config_file
neha130 Apr 10, 2025
8cc6f73
review commnets
prkhrkat Apr 11, 2025
e114028
review comments
prkhrkat Apr 11, 2025
ab7f960
Merge branch 'develop' into hibernated-fix
prkhrkat Apr 11, 2025
1b499b7
Merge branch 'hibernated-fix' into hibernated-fix-refact
prkhrkat Apr 11, 2025
603d0c9
Merge pull request #6506 from devtron-labs/hibernated-fix-refact
prkhrkat Apr 14, 2025
6459d27
Merge pull request #6494 from devtron-labs/hibernated-fix
prkhrkat Apr 14, 2025
fa2693a
main sync develop
vikramdevtron Apr 14, 2025
09fc9f8
vendor update
vikramdevtron Apr 14, 2025
aebe5d3
Merge pull request #6518 from devtron-labs/main-sync-develop-14apr
vikramdevtron Apr 14, 2025
4edda50
added more fields in webhook notification
prkhrkat Apr 15, 2025
77bf66b
Merge branch 'develop' into webhook-changes
prkhrkat Apr 15, 2025
56d412e
ci dangling pod fix
kartik-579 Apr 16, 2025
e17fec4
delete delay duration update
kartik-579 Apr 16, 2025
cd0ee66
removed delete delay seconds
kartik-579 Apr 16, 2025
e359b40
Merge pull request #6522 from devtron-labs/ci-danging-pod
kartik-579 Apr 16, 2025
9938fa5
Merge branch 'develop' into webhook-changes
prkhrkat Apr 16, 2025
87523ce
Merge pull request #6520 from devtron-labs/webhook-changes
prkhrkat Apr 16, 2025
8e3952a
fix: issues in helm apps and git provide (#6523)
iamayushm Apr 21, 2025
e8b7116
main sync develop
vikramdevtron Apr 21, 2025
d72c637
Merge pull request #6527 from devtron-labs/main-sync-develop-21apr
vikramdevtron Apr 21, 2025
7e2cda0
vendor update in develop
vikramdevtron Apr 21, 2025
30c942e
Merge pull request #6528 from devtron-labs/vendor-update-develop-21apr
vikramdevtron Apr 21, 2025
fc44e3c
refactor: Refactor ci and multi cluster cicd (#6505)
kartik-579 Apr 22, 2025
febdbf4
Merge pull request #6531 from devtron-labs/develop-sync-rc-22apr
vikramdevtron Apr 22, 2025
44e36db
retrigger bug (#6534)
Shivam-nagar23 Apr 24, 2025
b99bc5c
workflow status message fix (#6536)
Shivam-nagar23 Apr 25, 2025
d946a21
main sync rc
vikramdevtron Apr 25, 2025
e7da702
vendor update
vikramdevtron Apr 25, 2025
eeee6fc
Merge pull request #6538 from devtron-labs/main-sync-rc-25apr
vikramdevtron Apr 25, 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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
.env
/cmd/external-app/devtron-ea
devtron

.qodo
6 changes: 3 additions & 3 deletions App.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"fmt"
"github.com/devtron-labs/common-lib/middlewares"
pubsub "github.com/devtron-labs/common-lib/pubsub-lib"
posthogTelemetry "github.com/devtron-labs/common-lib/telemetry"
"github.com/devtron-labs/devtron/pkg/eventProcessor"
"github.com/devtron-labs/devtron/pkg/eventProcessor/in"
"log"
Expand All @@ -31,7 +32,6 @@ import (
"time"

"github.com/devtron-labs/devtron/api/util"
"github.com/devtron-labs/devtron/client/telemetry"
"github.com/devtron-labs/devtron/otel"
"github.com/devtron-labs/devtron/pkg/auth/user"

Expand All @@ -55,7 +55,7 @@ type App struct {
EnforcerV2 *casbinv2.SyncedEnforcer
server *http.Server
db *pg.DB
posthogClient *telemetry.PosthogClient
posthogClient *posthogTelemetry.PosthogClient
// eventProcessor.CentralEventProcessor is used to register event processors
centralEventProcessor *eventProcessor.CentralEventProcessor // do not remove this.
// used for local dev only
Expand All @@ -73,7 +73,7 @@ func NewApp(router *router.MuxRouter,
enforcer *casbin.SyncedEnforcer,
db *pg.DB,
sessionManager2 *authMiddleware.SessionManager,
posthogClient *telemetry.PosthogClient,
posthogClient *posthogTelemetry.PosthogClient,
loggingMiddleware util.LoggingMiddleware,
centralEventProcessor *eventProcessor.CentralEventProcessor,
pubSubClient *pubsub.PubSubClientServiceImpl,
Expand Down
15 changes: 8 additions & 7 deletions Wire.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ package main
import (
"github.com/devtron-labs/authenticator/middleware"
cloudProviderIdentifier "github.com/devtron-labs/common-lib/cloud-provider-identifier"
pubsub1 "github.com/devtron-labs/common-lib/pubsub-lib"
pubSub "github.com/devtron-labs/common-lib/pubsub-lib"
posthogTelemetry "github.com/devtron-labs/common-lib/telemetry"
util4 "github.com/devtron-labs/common-lib/utils/k8s"
"github.com/devtron-labs/devtron/api/apiToken"
appStoreRestHandler "github.com/devtron-labs/devtron/api/appStore"
Expand Down Expand Up @@ -144,6 +145,7 @@ import (
"github.com/devtron-labs/devtron/pkg/deploymentGroup"
"github.com/devtron-labs/devtron/pkg/dockerRegistry"
"github.com/devtron-labs/devtron/pkg/eventProcessor"
"github.com/devtron-labs/devtron/pkg/executor"
"github.com/devtron-labs/devtron/pkg/generateManifest"
"github.com/devtron-labs/devtron/pkg/gitops"
"github.com/devtron-labs/devtron/pkg/imageDigestPolicy"
Expand All @@ -165,6 +167,7 @@ import (
resourceGroup2 "github.com/devtron-labs/devtron/pkg/resourceGroup"
"github.com/devtron-labs/devtron/pkg/resourceQualifiers"
"github.com/devtron-labs/devtron/pkg/sql"
"github.com/devtron-labs/devtron/pkg/ucid"
util3 "github.com/devtron-labs/devtron/pkg/util"
"github.com/devtron-labs/devtron/pkg/variables"
"github.com/devtron-labs/devtron/pkg/variables/parsers"
Expand Down Expand Up @@ -219,7 +222,7 @@ func InitializeApp() (*App, error) {
userResource.UserResourceWireSet,
policyGovernance.PolicyGovernanceWireSet,
resourceScan.ScanningResultWireSet,

executor.ExecutorWireSet,
// -------wireset end ----------
// -------
gitSensor.GetConfig,
Expand Down Expand Up @@ -478,9 +481,6 @@ func InitializeApp() (*App, error) {
util.IntValidator,
types.GetCiCdConfig,

pipeline.NewWorkflowServiceImpl,
wire.Bind(new(pipeline.WorkflowService), new(*pipeline.WorkflowServiceImpl)),

pipeline.NewCiServiceImpl,
wire.Bind(new(pipeline.CiService), new(*pipeline.CiServiceImpl)),

Expand All @@ -501,7 +501,7 @@ func InitializeApp() (*App, error) {
pipeline.NewCiLogServiceImpl,
wire.Bind(new(pipeline.CiLogService), new(*pipeline.CiLogServiceImpl)),

pubsub1.NewPubSubClientServiceImpl,
pubSub.NewPubSubClientServiceImpl,

rbac.NewEnforcerUtilImpl,
wire.Bind(new(rbac.EnforcerUtil), new(*rbac.EnforcerUtilImpl)),
Expand Down Expand Up @@ -696,7 +696,8 @@ func InitializeApp() (*App, error) {
wire.Bind(new(router.TelemetryRouter), new(*router.TelemetryRouterImpl)),
restHandler.NewTelemetryRestHandlerImpl,
wire.Bind(new(restHandler.TelemetryRestHandler), new(*restHandler.TelemetryRestHandlerImpl)),
telemetry.NewPosthogClient,
posthogTelemetry.NewPosthogClient,
ucid.WireSet,

cloudProviderIdentifier.NewProviderIdentifierServiceImpl,
wire.Bind(new(cloudProviderIdentifier.ProviderIdentifierService), new(*cloudProviderIdentifier.ProviderIdentifierServiceImpl)),
Expand Down
12 changes: 6 additions & 6 deletions api/argoApplication/wire_argoApplication.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package argoApplication

import (
"github.com/devtron-labs/devtron/pkg/argoApplication"
argoApplication3 "github.com/devtron-labs/devtron/pkg/argoApplication"
"github.com/devtron-labs/devtron/pkg/argoApplication/read"
"github.com/devtron-labs/devtron/pkg/argoApplication/read/config"
"github.com/google/wire"
Expand All @@ -30,9 +30,9 @@ var ArgoApplicationWireSetFull = wire.NewSet(
config.NewArgoApplicationConfigServiceImpl,
wire.Bind(new(config.ArgoApplicationConfigService), new(*config.ArgoApplicationConfigServiceImpl)),

argoApplication.NewArgoApplicationServiceImpl,
argoApplication.NewArgoApplicationServiceExtendedServiceImpl,
wire.Bind(new(argoApplication.ArgoApplicationService), new(*argoApplication.ArgoApplicationServiceExtendedImpl)),
argoApplication3.NewArgoApplicationServiceImpl,
argoApplication3.NewArgoApplicationServiceExtendedServiceImpl,
wire.Bind(new(argoApplication3.ArgoApplicationService), new(*argoApplication3.ArgoApplicationServiceExtendedImpl)),

NewArgoApplicationRestHandlerImpl,
wire.Bind(new(ArgoApplicationRestHandler), new(*ArgoApplicationRestHandlerImpl)),
Expand All @@ -48,8 +48,8 @@ var ArgoApplicationWireSetEA = wire.NewSet(
config.NewArgoApplicationConfigServiceImpl,
wire.Bind(new(config.ArgoApplicationConfigService), new(*config.ArgoApplicationConfigServiceImpl)),

argoApplication.NewArgoApplicationServiceImpl,
wire.Bind(new(argoApplication.ArgoApplicationService), new(*argoApplication.ArgoApplicationServiceImpl)),
argoApplication3.NewArgoApplicationServiceImpl,
wire.Bind(new(argoApplication3.ArgoApplicationService), new(*argoApplication3.ArgoApplicationServiceImpl)),

NewArgoApplicationRestHandlerImpl,
wire.Bind(new(ArgoApplicationRestHandler), new(*ArgoApplicationRestHandlerImpl)),
Expand Down
2 changes: 1 addition & 1 deletion api/bean/AutocompleteConfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
package bean

type Config struct {
IgnoreAuthCheck bool `env:"IGNORE_AUTOCOMPLETE_AUTH_CHECK" envDefault:"false"`
IgnoreAuthCheck bool `env:"IGNORE_AUTOCOMPLETE_AUTH_CHECK" envDefault:"false" description:"flag for ignoring auth check in autocomplete apis."`
}
2 changes: 1 addition & 1 deletion api/helm-app/gRPC/applicationClient.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func NewHelmAppClientImpl(logger *zap.SugaredLogger,

// CATEGORY=INFRA_SETUP
type HelmClientConfig struct {
Url string `env:"HELM_CLIENT_URL" envDefault:"127.0.0.1:50051"`
Url string `env:"HELM_CLIENT_URL" envDefault:"127.0.0.1:50051" description:"Kubelink micro-service url "`
}

func GetConfig() (*HelmClientConfig, error) {
Expand Down
6 changes: 3 additions & 3 deletions api/helm-app/service/HelmAppService.go
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ func NewHelmAppServiceImpl(Logger *zap.SugaredLogger, clusterService cluster.Clu

// CATEGORY=CD
type HelmReleaseConfig struct {
RevisionHistoryLimitDevtronApp int `env:"REVISION_HISTORY_LIMIT_DEVTRON_APP" envDefault:"1"`
RevisionHistoryLimitHelmApp int `env:"REVISION_HISTORY_LIMIT_HELM_APP" envDefault:"1"`
RevisionHistoryLimitExternalHelmApp int `env:"REVISION_HISTORY_LIMIT_EXTERNAL_HELM_APP" envDefault:"0"`
RevisionHistoryLimitDevtronApp int `env:"REVISION_HISTORY_LIMIT_DEVTRON_APP" envDefault:"1" description:"Count for devtron application rivision history"`
RevisionHistoryLimitHelmApp int `env:"REVISION_HISTORY_LIMIT_HELM_APP" envDefault:"1" description:"To set the history limit for the helm app being deployed through devtron"`
RevisionHistoryLimitExternalHelmApp int `env:"REVISION_HISTORY_LIMIT_EXTERNAL_HELM_APP" envDefault:"0" description:"Count for external helm application rivision history"`
RevisionHistoryLimitLinkedHelmApp int `env:"REVISION_HISTORY_LIMIT_LINKED_HELM_APP" envDefault:"15"`
}

Expand Down
3 changes: 2 additions & 1 deletion api/restHandler/CoreAppRestHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"github.com/devtron-labs/devtron/pkg/build/git/gitProvider"
"github.com/devtron-labs/devtron/pkg/build/git/gitProvider/read"
pipelineBean "github.com/devtron-labs/devtron/pkg/build/pipeline/bean"
common2 "github.com/devtron-labs/devtron/pkg/build/pipeline/bean/common"
bean3 "github.com/devtron-labs/devtron/pkg/chart/bean"
read5 "github.com/devtron-labs/devtron/pkg/chart/read"
"github.com/devtron-labs/devtron/pkg/cluster/environment/repository"
Expand Down Expand Up @@ -1688,7 +1689,7 @@ func (handler CoreAppRestHandlerImpl) createCiPipeline(appId int, userId int32,
ParentCiPipeline: ciPipelineData.ParentCiPipeline,
ParentAppId: ciPipelineData.ParentAppId,
LinkedCount: ciPipelineData.LinkedCount,
PipelineType: pipelineBean.PipelineType(ciPipelineData.PipelineType),
PipelineType: common2.PipelineType(ciPipelineData.PipelineType),
},
}

Expand Down
Loading