Skip to content

Feat: helm app status update periodically #1896

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.

Sign up for GitHub

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 6 commits into from
Jun 21, 2022
Merged

Feat: helm app status update periodically #1896

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a77375a
helm app status update cron job added for apps created by cd pipeline
vikramdevtron Jun 16, 2022
b87bd8d
cd pipeline status fix
vikramdevtron Jun 17, 2022
578637c
review changes
vikramdevtron Jun 20, 2022
26a5f67
Merge branch 'main' into helm-app-status-update-cron-job
vikramdevtron Jun 20, 2022
016a2e6
final review changes
vikramdevtron Jun 21, 2022
a6edb6c
Merge branch 'main' into helm-app-status-update-cron-job
vikramdevtron Jun 21, 2022
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: 3 additions & 1 deletion Wire.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ func InitializeApp() (*App, error) {
wire.Bind(new(router.CommonRouter), new(*router.CommonRouterImpl)),
restHandler.NewCommonRestHanlderImpl,
wire.Bind(new(restHandler.CommonRestHanlder), new(*restHandler.CommonRestHanlderImpl)),

util.NewGitCliUtil,

router.NewTelemetryRouterImpl,
Expand Down Expand Up @@ -719,6 +719,8 @@ func InitializeApp() (*App, error) {
//plugin ends

// AuthWireSet,
pubsub.NewHelmApplicationStatusUpdateHandlerImpl,
wire.Bind(new(pubsub.HelmApplicationStatusUpdateHandler), new(*pubsub.HelmApplicationStatusUpdateHandlerImpl)),
)
return &App{}, nil
}
2 changes: 1 addition & 1 deletion api/router/pubsub/ApplicationStatusUpdateHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func (impl *ApplicationStatusUpdateHandlerImpl) Subscribe() error {
} else if application.Status.OperationState != nil && application.Status.OperationState.Operation.Sync != nil {
gitHash = application.Status.OperationState.Operation.Sync.Revision
}
err = impl.workflowDagExecutor.HandleDeploymentSuccessEvent(gitHash)
err = impl.workflowDagExecutor.HandleDeploymentSuccessEvent(gitHash, 0)
if err != nil {
impl.logger.Errorw("deployment success event error", "gitHash", gitHash, "err", err)
return
Expand Down
55 changes: 55 additions & 0 deletions api/router/pubsub/HelmApplicationStatusUpdateHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package pubsub

import (
"github.com/devtron-labs/devtron/pkg/app"
"github.com/devtron-labs/devtron/pkg/appStore/deployment/service"
"github.com/devtron-labs/devtron/pkg/pipeline"
"github.com/robfig/cron/v3"
"go.uber.org/zap"
)

type HelmApplicationStatusUpdateHandler interface {
HelmApplicationStatusUpdate()
}

type HelmApplicationStatusUpdateHandlerImpl struct {
logger *zap.SugaredLogger
cron *cron.Cron
appService app.AppService
workflowDagExecutor pipeline.WorkflowDagExecutor
installedAppService service.InstalledAppService
CdHandler pipeline.CdHandler
}

const HelmAppStatusUpdateCronExpr string = "*/2 * * * *"

func NewHelmApplicationStatusUpdateHandlerImpl(logger *zap.SugaredLogger, appService app.AppService,
workflowDagExecutor pipeline.WorkflowDagExecutor, installedAppService service.InstalledAppService,
CdHandler pipeline.CdHandler) *HelmApplicationStatusUpdateHandlerImpl {
cron := cron.New(
cron.WithChain())
cron.Start()
impl := &HelmApplicationStatusUpdateHandlerImpl{
logger: logger,
cron: cron,
appService: appService,
workflowDagExecutor: workflowDagExecutor,
installedAppService: installedAppService,
CdHandler: CdHandler,
}
_, err := cron.AddFunc(HelmAppStatusUpdateCronExpr, impl.HelmApplicationStatusUpdate)
if err != nil {
logger.Errorw("error in starting helm application status update cron job", "err", err)
return nil
}
return impl
}

func (impl *HelmApplicationStatusUpdateHandlerImpl) HelmApplicationStatusUpdate() {
err := impl.CdHandler.CheckHelmAppStatusPeriodicallyAndUpdateInDb()
if err != nil {
impl.logger.Errorw("error helm app status update - cron job", "err", err)
return
}
return
}
245 changes: 124 additions & 121 deletions api/router/router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,66 +48,67 @@ import (
)

type MuxRouter struct {
logger *zap.SugaredLogger
Router *mux.Router
HelmRouter HelmRouter
PipelineConfigRouter PipelineConfigRouter
MigrateDbRouter MigrateDbRouter
EnvironmentClusterMappingsRouter cluster.EnvironmentRouter
AppListingRouter AppListingRouter
ClusterRouter cluster.ClusterRouter
WebHookRouter WebhookRouter
UserAuthRouter user.UserAuthRouter
ApplicationRouter ApplicationRouter
CDRouter CDRouter
ProjectManagementRouter ProjectManagementRouter
GitProviderRouter GitProviderRouter
GitHostRouter GitHostRouter
DockerRegRouter DockerRegRouter
NotificationRouter NotificationRouter
TeamRouter team.TeamRouter
pubsubClient *pubsub2.PubSubClient
UserRouter user.UserRouter
gitWebhookHandler pubsub.GitWebhookHandler
workflowUpdateHandler pubsub.WorkflowStatusUpdateHandler
appUpdateHandler pubsub.ApplicationStatusUpdateHandler
ciEventHandler pubsub.CiEventHandler
cronBasedEventReceiver pubsub.CronBasedEventReceiver
ChartRefRouter ChartRefRouter
ConfigMapRouter ConfigMapRouter
AppStoreRouter appStore.AppStoreRouter
ChartRepositoryRouter chartRepo.ChartRepositoryRouter
ReleaseMetricsRouter ReleaseMetricsRouter
deploymentGroupRouter DeploymentGroupRouter
chartGroupRouter ChartGroupRouter
batchOperationRouter BatchOperationRouter
testSuitRouter TestSuitRouter
imageScanRouter ImageScanRouter
policyRouter PolicyRouter
gitOpsConfigRouter GitOpsConfigRouter
dashboardRouter dashboard.DashboardRouter
attributesRouter AttributesRouter
commonRouter CommonRouter
grafanaRouter GrafanaRouter
ssoLoginRouter sso.SsoLoginRouter
telemetryRouter TelemetryRouter
telemetryWatcher telemetry.TelemetryEventClient
bulkUpdateRouter BulkUpdateRouter
WebhookListenerRouter WebhookListenerRouter
appLabelsRouter AppLabelRouter
coreAppRouter CoreAppRouter
helmAppRouter client.HelmAppRouter
k8sApplicationRouter k8s.K8sApplicationRouter
pProfRouter PProfRouter
deploymentConfigRouter deployment.DeploymentConfigRouter
dashboardTelemetryRouter dashboardEvent.DashboardTelemetryRouter
commonDeploymentRouter appStoreDeployment.CommonDeploymentRouter
globalPluginRouter GlobalPluginRouter
externalLinkRouter externalLink.ExternalLinkRouter
selfRegistrationRolesRouter user.SelfRegistrationRolesRouter
moduleRouter module.ModuleRouter
serverRouter server.ServerRouter
apiTokenRouter apiToken.ApiTokenRouter
logger *zap.SugaredLogger
Router *mux.Router
HelmRouter HelmRouter
PipelineConfigRouter PipelineConfigRouter
MigrateDbRouter MigrateDbRouter
EnvironmentClusterMappingsRouter cluster.EnvironmentRouter
AppListingRouter AppListingRouter
ClusterRouter cluster.ClusterRouter
WebHookRouter WebhookRouter
UserAuthRouter user.UserAuthRouter
ApplicationRouter ApplicationRouter
CDRouter CDRouter
ProjectManagementRouter ProjectManagementRouter
GitProviderRouter GitProviderRouter
GitHostRouter GitHostRouter
DockerRegRouter DockerRegRouter
NotificationRouter NotificationRouter
TeamRouter team.TeamRouter
pubsubClient *pubsub2.PubSubClient
UserRouter user.UserRouter
gitWebhookHandler pubsub.GitWebhookHandler
workflowUpdateHandler pubsub.WorkflowStatusUpdateHandler
appUpdateHandler pubsub.ApplicationStatusUpdateHandler
ciEventHandler pubsub.CiEventHandler
cronBasedEventReceiver pubsub.CronBasedEventReceiver
ChartRefRouter ChartRefRouter
ConfigMapRouter ConfigMapRouter
AppStoreRouter appStore.AppStoreRouter
ChartRepositoryRouter chartRepo.ChartRepositoryRouter
ReleaseMetricsRouter ReleaseMetricsRouter
deploymentGroupRouter DeploymentGroupRouter
chartGroupRouter ChartGroupRouter
batchOperationRouter BatchOperationRouter
testSuitRouter TestSuitRouter
imageScanRouter ImageScanRouter
policyRouter PolicyRouter
gitOpsConfigRouter GitOpsConfigRouter
dashboardRouter dashboard.DashboardRouter
attributesRouter AttributesRouter
commonRouter CommonRouter
grafanaRouter GrafanaRouter
ssoLoginRouter sso.SsoLoginRouter
telemetryRouter TelemetryRouter
telemetryWatcher telemetry.TelemetryEventClient
bulkUpdateRouter BulkUpdateRouter
WebhookListenerRouter WebhookListenerRouter
appLabelsRouter AppLabelRouter
coreAppRouter CoreAppRouter
helmAppRouter client.HelmAppRouter
k8sApplicationRouter k8s.K8sApplicationRouter
pProfRouter PProfRouter
deploymentConfigRouter deployment.DeploymentConfigRouter
dashboardTelemetryRouter dashboardEvent.DashboardTelemetryRouter
commonDeploymentRouter appStoreDeployment.CommonDeploymentRouter
globalPluginRouter GlobalPluginRouter
externalLinkRouter externalLink.ExternalLinkRouter
selfRegistrationRolesRouter user.SelfRegistrationRolesRouter
moduleRouter module.ModuleRouter
serverRouter server.ServerRouter
apiTokenRouter apiToken.ApiTokenRouter
helmApplicationStatusUpdateHandler pubsub.HelmApplicationStatusUpdateHandler
}

func NewMuxRouter(logger *zap.SugaredLogger, HelmRouter HelmRouter, PipelineConfigRouter PipelineConfigRouter,
Expand All @@ -132,68 +133,70 @@ func NewMuxRouter(logger *zap.SugaredLogger, HelmRouter HelmRouter, PipelineConf
pProfRouter PProfRouter, deploymentConfigRouter deployment.DeploymentConfigRouter, dashboardTelemetryRouter dashboardEvent.DashboardTelemetryRouter,
commonDeploymentRouter appStoreDeployment.CommonDeploymentRouter, externalLinkRouter externalLink.ExternalLinkRouter,
globalPluginRouter GlobalPluginRouter, selfRegistrationRolesRouter user.SelfRegistrationRolesRouter, moduleRouter module.ModuleRouter,
serverRouter server.ServerRouter, apiTokenRouter apiToken.ApiTokenRouter) *MuxRouter {
serverRouter server.ServerRouter, apiTokenRouter apiToken.ApiTokenRouter,
helmApplicationStatusUpdateHandler pubsub.HelmApplicationStatusUpdateHandler) *MuxRouter {
r := &MuxRouter{
Router: mux.NewRouter(),
HelmRouter: HelmRouter,
PipelineConfigRouter: PipelineConfigRouter,
MigrateDbRouter: MigrateDbRouter,
EnvironmentClusterMappingsRouter: EnvironmentClusterMappingsRouter,
AppListingRouter: AppListingRouter,
ClusterRouter: ClusterRouter,
WebHookRouter: WebHookRouter,
UserAuthRouter: UserAuthRouter,
ApplicationRouter: ApplicationRouter,
CDRouter: CDRouter,
ProjectManagementRouter: ProjectManagementRouter,
DockerRegRouter: DockerRegRouter,
GitProviderRouter: GitProviderRouter,
GitHostRouter: GitHostRouter,
NotificationRouter: NotificationRouter,
TeamRouter: TeamRouter,
logger: logger,
gitWebhookHandler: gitWebhookHandler,
workflowUpdateHandler: workflowUpdateHandler,
appUpdateHandler: appUpdateHandler,
ciEventHandler: ciEventHandler,
pubsubClient: pubsubClient,
UserRouter: UserRouter,
cronBasedEventReceiver: cronBasedEventReceiver,
ChartRefRouter: ChartRefRouter,
ConfigMapRouter: ConfigMapRouter,
AppStoreRouter: AppStoreRouter,
ChartRepositoryRouter: chartRepositoryRouter,
ReleaseMetricsRouter: ReleaseMetricsRouter,
deploymentGroupRouter: deploymentGroupRouter,
batchOperationRouter: batchOperationRouter,
chartGroupRouter: chartGroupRouter,
testSuitRouter: testSuitRouter,
imageScanRouter: imageScanRouter,
policyRouter: policyRouter,
gitOpsConfigRouter: gitOpsConfigRouter,
attributesRouter: attributesRouter,
dashboardRouter: dashboardRouter,
commonRouter: commonRouter,
grafanaRouter: grafanaRouter,
ssoLoginRouter: ssoLoginRouter,
telemetryRouter: telemetryRouter,
telemetryWatcher: telemetryWatcher,
bulkUpdateRouter: bulkUpdateRouter,
WebhookListenerRouter: webhookListenerRouter,
appLabelsRouter: appLabelsRouter,
coreAppRouter: coreAppRouter,
helmAppRouter: helmAppRouter,
k8sApplicationRouter: k8sApplicationRouter,
pProfRouter: pProfRouter,
deploymentConfigRouter: deploymentConfigRouter,
dashboardTelemetryRouter: dashboardTelemetryRouter,
commonDeploymentRouter: commonDeploymentRouter,
externalLinkRouter: externalLinkRouter,
globalPluginRouter: globalPluginRouter,
selfRegistrationRolesRouter: selfRegistrationRolesRouter,
moduleRouter: moduleRouter,
serverRouter: serverRouter,
apiTokenRouter: apiTokenRouter,
Router: mux.NewRouter(),
HelmRouter: HelmRouter,
PipelineConfigRouter: PipelineConfigRouter,
MigrateDbRouter: MigrateDbRouter,
EnvironmentClusterMappingsRouter: EnvironmentClusterMappingsRouter,
AppListingRouter: AppListingRouter,
ClusterRouter: ClusterRouter,
WebHookRouter: WebHookRouter,
UserAuthRouter: UserAuthRouter,
ApplicationRouter: ApplicationRouter,
CDRouter: CDRouter,
ProjectManagementRouter: ProjectManagementRouter,
DockerRegRouter: DockerRegRouter,
GitProviderRouter: GitProviderRouter,
GitHostRouter: GitHostRouter,
NotificationRouter: NotificationRouter,
TeamRouter: TeamRouter,
logger: logger,
gitWebhookHandler: gitWebhookHandler,
workflowUpdateHandler: workflowUpdateHandler,
appUpdateHandler: appUpdateHandler,
ciEventHandler: ciEventHandler,
pubsubClient: pubsubClient,
UserRouter: UserRouter,
cronBasedEventReceiver: cronBasedEventReceiver,
ChartRefRouter: ChartRefRouter,
ConfigMapRouter: ConfigMapRouter,
AppStoreRouter: AppStoreRouter,
ChartRepositoryRouter: chartRepositoryRouter,
ReleaseMetricsRouter: ReleaseMetricsRouter,
deploymentGroupRouter: deploymentGroupRouter,
batchOperationRouter: batchOperationRouter,
chartGroupRouter: chartGroupRouter,
testSuitRouter: testSuitRouter,
imageScanRouter: imageScanRouter,
policyRouter: policyRouter,
gitOpsConfigRouter: gitOpsConfigRouter,
attributesRouter: attributesRouter,
dashboardRouter: dashboardRouter,
commonRouter: commonRouter,
grafanaRouter: grafanaRouter,
ssoLoginRouter: ssoLoginRouter,
telemetryRouter: telemetryRouter,
telemetryWatcher: telemetryWatcher,
bulkUpdateRouter: bulkUpdateRouter,
WebhookListenerRouter: webhookListenerRouter,
appLabelsRouter: appLabelsRouter,
coreAppRouter: coreAppRouter,
helmAppRouter: helmAppRouter,
k8sApplicationRouter: k8sApplicationRouter,
pProfRouter: pProfRouter,
deploymentConfigRouter: deploymentConfigRouter,
dashboardTelemetryRouter: dashboardTelemetryRouter,
commonDeploymentRouter: commonDeploymentRouter,
externalLinkRouter: externalLinkRouter,
globalPluginRouter: globalPluginRouter,
selfRegistrationRolesRouter: selfRegistrationRolesRouter,
moduleRouter: moduleRouter,
serverRouter: serverRouter,
apiTokenRouter: apiTokenRouter,
helmApplicationStatusUpdateHandler: helmApplicationStatusUpdateHandler,
}
return r
}
Expand Down
19 changes: 19 additions & 0 deletions internal/sql/repository/chartConfig/PipelineOverrideRepository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,16 @@
package chartConfig

import (
"github.com/devtron-labs/devtron/api/bean"
"github.com/devtron-labs/devtron/client/argocdServer/application"
"github.com/devtron-labs/devtron/internal/sql/models"
"github.com/devtron-labs/devtron/internal/sql/repository"
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
"github.com/devtron-labs/devtron/internal/util"
"github.com/devtron-labs/devtron/pkg/sql"
"github.com/go-pg/pg"
"github.com/juju/errors"
"time"
)

type PipelineOverride struct {
Expand Down Expand Up @@ -62,6 +65,7 @@ type PipelineOverrideRepository interface {
GetByDeployedImage(appId, environmentId int, images []string) (pipelineOverride *PipelineOverride, err error)
GetLatestReleaseByPipelineIds(pipelineIds []int) (pipelineOverrides []*PipelineOverride, err error)
GetLatestReleaseDeploymentType(pipelineIds []int) ([]*PipelineOverride, error)
FetchHelmTypePipelineOverridesForStatusUpdate() (pipelines []*PipelineOverride, err error)
}

type PipelineOverrideRepositoryImpl struct {
Expand Down Expand Up @@ -216,3 +220,18 @@ func (impl PipelineOverrideRepositoryImpl) FindById(id int) (*PipelineOverride,
Select()
return &pipelineOverride, err
}

func (impl PipelineOverrideRepositoryImpl) FetchHelmTypePipelineOverridesForStatusUpdate() (pipelines []*PipelineOverride, err error) {
err = impl.dbConnection.Model(&pipelines).
Column("pipeline_override.*", "Pipeline", "Pipeline.App", "Pipeline.Environment").
Join("inner join pipeline p on p.id = pipeline_override.pipeline_id").
Join("inner join cd_workflow cdwf on cdwf.pipeline_id = p.id").
Join("inner join cd_workflow_runner cdwfr on cdwfr.cd_workflow_id = cdwf.id").
Where("p.deployment_app_type = ?", util.PIPELINE_DEPLOYMENT_TYPE_HELM).
Where("cdwfr.status != ?", application.Healthy).
Where("cdwfr.status != ?", application.Suspended).
Where("cdwfr.workflow_type = ?", bean.CD_WORKFLOW_TYPE_DEPLOY).
Where("pipeline_override.created_on > ?", time.Now().Add(-time.Minute*10)).
Select()
return pipelines, err
}
2 changes: 1 addition & 1 deletion internal/sql/repository/pipelineConfig/PipelineRepository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,4 +410,4 @@ func (impl PipelineRepositoryImpl) GetAppAndEnvDetailsForDeploymentAppTypePipeli
Where("pipeline.deployment_app_type = ?", deploymentAppType).
Select()
return pipelines, err
}
}
Loading