Skip to content

[DONT MERGE] cherry pick #4579 to release 4.2.0 #4580

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

Open
PetrusZ wants to merge 1 commit into
base: release-4.2.0
Choose a base branch
from
Open

[DONT MERGE] cherry pick #4579 to release 4.2.0 #4580

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions pkg/microservice/aslan/core/workflow/service/workflow/controller/job/job_deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ func (j DeployJobController) Update(useUserInput bool, ticket *commonmodels.Appr
// source is a bit tricky: if the saved args has a source of fromjob, but it has been change to runtime in the config
// we need to not only update its source but also set services to empty slice.
if j.jobSpec.Source == config.SourceFromJob && latestSpec.Source == config.SourceRuntime {
log.Infof("[deploy job]: source changed")
j.jobSpec.Services = make([]*commonmodels.DeployServiceInfo, 0)
}
j.jobSpec.Source = latestSpec.Source
Expand Down Expand Up @@ -178,11 +179,13 @@ func (j DeployJobController) Update(useUserInput bool, ticket *commonmodels.Appr
}

if _, ok := currentEnvMap[j.jobSpec.Env]; !ok {
log.Infof("[deploy job]: env %s not in current env any more", j.jobSpec.Env)
j.jobSpec.Env = ""
}

// if unselected for some reason, we skip calculating default service
if j.jobSpec.Env == "" {
log.Infof("[deploy job]: env is empty, clear services")
j.jobSpec.Services = make([]*commonmodels.DeployServiceInfo, 0)
return nil
}
Expand Down Expand Up @@ -215,6 +218,7 @@ func (j DeployJobController) Update(useUserInput bool, ticket *commonmodels.Appr

if j.jobSpec.Env != latestSpec.Env && latestSpec.EnvSource == config.ParamSourceFixed {
j.jobSpec.Env = latestSpec.Env
log.Infof("[deploy job]: env source is fixed, but env changed, clear services")
j.jobSpec.Services = make([]*commonmodels.DeployServiceInfo, 0)
return nil
}
Expand All @@ -226,6 +230,7 @@ func (j DeployJobController) Update(useUserInput bool, ticket *commonmodels.Appr
return err
} else {
// if the source is not fixed, then we don't return error if we can't find env information for deployment, just remove the configured default env.
log.Infof("[deploy job]: generateDeployInfoForEnv err %v, clear env and services", err)
j.jobSpec.Env = ""
j.jobSpec.Services = make([]*commonmodels.DeployServiceInfo, 0)
return nil
Expand Down Expand Up @@ -339,6 +344,7 @@ func (j DeployJobController) SetOptions(ticket *commonmodels.ApprovalTicket) err
userConfiguredSvc[svc.ServiceName] = svc
}

log.Infof("[deploy job]: len service of env %s in options: %s", env.Env, len(env.Services))
for _, svc := range env.Services {
if inputSvc, ok := userConfiguredSvc[svc.ServiceName]; ok {
// if the user wants to update config/variables do the merge variables logic, otherwise do nothing just add it to the user's selection
Expand Down Expand Up @@ -418,6 +424,10 @@ func (j DeployJobController) ToTask(taskID int64) ([]*commonmodels.JobTask, erro

productServiceMap := product.GetServiceMap()

if len(j.jobSpec.Services) == 0 {
return nil, fmt.Errorf("deploy service is empty for env %s, source: %s, env source: %s, from job name: %s", j.jobSpec.Env, j.jobSpec.Source, j.jobSpec.EnvSource, j.jobSpec.JobName)
}

// get deploy info from previous build job
if j.jobSpec.Source == config.SourceFromJob {
// adapt to the front end, use the direct quoted job name
Expand Down
Loading