Skip to content

fix: added deployment app type support for app create api, separated cron time for helm app status update #2995

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 2 commits into from
Feb 20, 2023
Merged

fix: added deployment app type support for app create api, separated cron time for helm app status update #2995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b7a539
wip
kartik-579 Feb 20, 2023
35f7abf
updated spec
kartik-579 Feb 20, 2023
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
1 change: 1 addition & 0 deletions api/appbean/AppDetail.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ type CdPipelineDetails struct {
Name string `json:"name"` //pipelineName
EnvironmentName string `json:"environmentName" `
TriggerType pipelineConfig.TriggerType `json:"triggerType" validate:"required"`
DeploymentAppType string `json:"deploymentAppType"`
DeploymentStrategyType chartRepoRepository.DeploymentStrategy `json:"deploymentType,omitempty"` //
DeploymentStrategies []*DeploymentStrategy `json:"deploymentStrategies"`
PreStage *CdStage `json:"preStage"`
Expand Down
1 change: 1 addition & 0 deletions api/restHandler/CoreAppRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1646,6 +1646,7 @@ func (handler CoreAppRestHandlerImpl) createCdPipelines(ctx context.Context, app
Namespace: envModel.Namespace,
AppWorkflowId: workflowId,
CiPipelineId: ciPipelineId,
DeploymentAppType: cdPipeline.DeploymentAppType,
DeploymentTemplate: cdPipeline.DeploymentStrategyType,
TriggerType: cdPipeline.TriggerType,
CdArgoSetup: cdPipeline.IsClusterCdActive,
Expand Down
2 changes: 1 addition & 1 deletion client/cron/CdApplicationStatusUpdateHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func NewCdApplicationStatusUpdateHandlerImpl(logger *zap.SugaredLogger, appServi
logger.Errorw("error on subscribe", "err", err)
return nil
}
_, err = cron.AddFunc(AppStatusConfig.CdPipelineStatusCronTime, impl.HelmApplicationStatusUpdate)
_, err = cron.AddFunc(AppStatusConfig.CdHelmPipelineStatusCronTime, impl.HelmApplicationStatusUpdate)
if err != nil {
logger.Errorw("error in starting helm application status update cron job", "err", err)
return nil
Expand Down
1 change: 1 addition & 0 deletions pkg/app/AppService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ import (

type AppStatusConfig struct {
CdPipelineStatusCronTime string `env:"CD_PIPELINE_STATUS_CRON_TIME" envDefault:"*/2 * * * *"`
CdHelmPipelineStatusCronTime string `env:"CD_HELM_PIPELINE_STATUS_CRON_TIME" envDefault:"*/2 * * * *"`
CdPipelineStatusTimeoutDuration string `env:"CD_PIPELINE_STATUS_TIMEOUT_DURATION" envDefault:"20"` //in minutes
PipelineDegradedTime string `env:"PIPELINE_DEGRADED_TIME" envDefault:"10"` //in minutes
HelmPipelineStatusCheckEligibleTime string `env:"HELM_PIPELINE_STATUS_CHECK_ELIGIBLE_TIME" envDefault:"120"` //in seconds
Expand Down
5 changes: 5 additions & 0 deletions specs/app_create_api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,11 @@ components:
type: string
triggerType:
type: string
deploymentAppType:
type: string
oneOf:
- 'argo_cd'
- 'helm'
deploymentType:
type: string
deploymentStrategies:
Expand Down