Skip to content

Commit

Permalink
Merge pull request #999 from ddh27/release-1.9.0
Browse files Browse the repository at this point in the history 
fix resetImagePolicy cherry-pick
  • Loading branch information
@jamsman94
jamsman94 authored Jan 26, 2022
2 parents 031f223 + 361bb68 commit 089bf03
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 44 deletions.
90 changes: 46 additions & 44 deletions pkg/microservice/aslan/core/common/repository/models/queue.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,53 +22,55 @@ import (
"go.mongodb.org/mongo-driver/bson/primitive"

"github.com/koderover/zadig/pkg/microservice/aslan/config"
"github.com/koderover/zadig/pkg/setting"
)

type Queue struct {
ID primitive.ObjectID `bson:"_id,omitempty" json:"id,omitempty"`
TaskID int64 `bson:"task_id" json:"task_id"`
ProductName string `bson:"product_name" json:"product_name"`
PipelineName string `bson:"pipeline_name" json:"pipeline_name"`
Namespace string `bson:"namespace,omitempty" json:"namespace,omitempty"`
Type config.PipelineType `bson:"type" json:"type"`
Status config.Status `bson:"status" json:"status,omitempty"`
Description string `bson:"description,omitempty" json:"description,omitempty"`
TaskCreator string `bson:"task_creator" json:"task_creator,omitempty"`
TaskRevoker string `bson:"task_revoker,omitempty" json:"task_revoker,omitempty"`
CreateTime int64 `bson:"create_time" json:"create_time,omitempty"`
StartTime int64 `bson:"start_time" json:"start_time,omitempty"`
EndTime int64 `bson:"end_time" json:"end_time,omitempty"`
SubTasks []map[string]interface{} `bson:"sub_tasks" json:"sub_tasks"`
Stages []*Stage `bson:"stages" json:"stages"`
ReqID string `bson:"req_id,omitempty" json:"req_id,omitempty"`
AgentHost string `bson:"agent_host,omitempty" json:"agent_host,omitempty"`
DockerHost string `bson:"-" json:"docker_host,omitempty"`
TeamID int `bson:"team_id,omitempty" json:"team_id,omitempty"`
TeamName string `bson:"team,omitempty" json:"team,omitempty"`
IsDeleted bool `bson:"is_deleted" json:"is_deleted"`
IsArchived bool `bson:"is_archived" json:"is_archived"`
AgentID string `bson:"agent_id" json:"agent_id"`
MultiRun bool `bson:"multi_run" json:"multi_run"`
Target string `bson:"target,omitempty" json:"target"` // target service name, for k8s: containerName, for pm: serviceName
BuildModuleVer string `bson:"build_module_ver,omitempty" json:"build_module_ver"`
ServiceName string `bson:"service_name,omitempty" json:"service_name,omitempty"`
TaskArgs *TaskArgs `bson:"task_args,omitempty" json:"task_args,omitempty"` // TaskArgs job parameters for single-service workflow
WorkflowArgs *WorkflowTaskArgs `bson:"workflow_args" json:"workflow_args,omitempty"` // WorkflowArgs job parameters for multi-service workflow
TestArgs *TestTaskArgs `bson:"test_args,omitempty" json:"test_args,omitempty"` // TestArgs parameters for testing
ServiceTaskArgs *ServiceTaskArgs `bson:"service_args,omitempty" json:"service_args,omitempty"` // ServiceTaskArgs parameters for script-deployed workflows
ArtifactPackageTaskArgs *ArtifactPackageTaskArgs `bson:"artifact_package_args,omitempty" json:"artifact_package_args,omitempty"`
ConfigPayload *ConfigPayload `bson:"configpayload,omitempty" json:"config_payload"`
Error string `bson:"error,omitempty" json:"error,omitempty"`
Services [][]*ProductService `bson:"services" json:"services"`
Render *RenderInfo `bson:"render" json:"render"`
StorageURI string `bson:"storage_uri,omitempty" json:"storage_uri,omitempty"`
TestReports map[string]interface{} `bson:"test_reports,omitempty" json:"test_reports,omitempty"`
RwLock sync.Mutex `bson:"-" json:"-"`
ResetImage bool `bson:"resetImage" json:"resetImage"`
TriggerBy *TriggerBy `bson:"trigger_by,omitempty" json:"trigger_by,omitempty"`
Features []string `bson:"features" json:"features"`
IsRestart bool `bson:"is_restart" json:"is_restart"`
StorageEndpoint string `bson:"storage_endpoint" json:"storage_endpoint"`
ID primitive.ObjectID `bson:"_id,omitempty" json:"id,omitempty"`
TaskID int64 `bson:"task_id" json:"task_id"`
ProductName string `bson:"product_name" json:"product_name"`
PipelineName string `bson:"pipeline_name" json:"pipeline_name"`
Namespace string `bson:"namespace,omitempty" json:"namespace,omitempty"`
Type config.PipelineType `bson:"type" json:"type"`
Status config.Status `bson:"status" json:"status,omitempty"`
Description string `bson:"description,omitempty" json:"description,omitempty"`
TaskCreator string `bson:"task_creator" json:"task_creator,omitempty"`
TaskRevoker string `bson:"task_revoker,omitempty" json:"task_revoker,omitempty"`
CreateTime int64 `bson:"create_time" json:"create_time,omitempty"`
StartTime int64 `bson:"start_time" json:"start_time,omitempty"`
EndTime int64 `bson:"end_time" json:"end_time,omitempty"`
SubTasks []map[string]interface{} `bson:"sub_tasks" json:"sub_tasks"`
Stages []*Stage `bson:"stages" json:"stages"`
ReqID string `bson:"req_id,omitempty" json:"req_id,omitempty"`
AgentHost string `bson:"agent_host,omitempty" json:"agent_host,omitempty"`
DockerHost string `bson:"-" json:"docker_host,omitempty"`
TeamID int `bson:"team_id,omitempty" json:"team_id,omitempty"`
TeamName string `bson:"team,omitempty" json:"team,omitempty"`
IsDeleted bool `bson:"is_deleted" json:"is_deleted"`
IsArchived bool `bson:"is_archived" json:"is_archived"`
AgentID string `bson:"agent_id" json:"agent_id"`
MultiRun bool `bson:"multi_run" json:"multi_run"`
Target string `bson:"target,omitempty" json:"target"` // target service name, for k8s: containerName, for pm: serviceName
BuildModuleVer string `bson:"build_module_ver,omitempty" json:"build_module_ver"`
ServiceName string `bson:"service_name,omitempty" json:"service_name,omitempty"`
TaskArgs *TaskArgs `bson:"task_args,omitempty" json:"task_args,omitempty"` // TaskArgs job parameters for single-service workflow
WorkflowArgs *WorkflowTaskArgs `bson:"workflow_args" json:"workflow_args,omitempty"` // WorkflowArgs job parameters for multi-service workflow
TestArgs *TestTaskArgs `bson:"test_args,omitempty" json:"test_args,omitempty"` // TestArgs parameters for testing
ServiceTaskArgs *ServiceTaskArgs `bson:"service_args,omitempty" json:"service_args,omitempty"` // ServiceTaskArgs parameters for script-deployed workflows
ArtifactPackageTaskArgs *ArtifactPackageTaskArgs `bson:"artifact_package_args,omitempty" json:"artifact_package_args,omitempty"`
ConfigPayload *ConfigPayload `bson:"configpayload,omitempty" json:"config_payload"`
Error string `bson:"error,omitempty" json:"error,omitempty"`
Services [][]*ProductService `bson:"services" json:"services"`
Render *RenderInfo `bson:"render" json:"render"`
StorageURI string `bson:"storage_uri,omitempty" json:"storage_uri,omitempty"`
TestReports map[string]interface{} `bson:"test_reports,omitempty" json:"test_reports,omitempty"`
RwLock sync.Mutex `bson:"-" json:"-"`
ResetImage bool `bson:"resetImage" json:"resetImage"`
ResetImagePolicy setting.ResetImagePolicyType `bson:"reset_image_policy" json:"reset_image_policy"`
TriggerBy *TriggerBy `bson:"trigger_by,omitempty" json:"trigger_by,omitempty"`
Features []string `bson:"features" json:"features"`
IsRestart bool `bson:"is_restart" json:"is_restart"`
StorageEndpoint string `bson:"storage_endpoint" json:"storage_endpoint"`
}

type TriggerBy struct {
Expand Down
2 changes: 2 additions & 0 deletions pkg/microservice/aslan/core/workflow/service/workflow/convert.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ func ConvertQueueToTask(queueTask *commonmodels.Queue) *task.Task {
TestReports: queueTask.TestReports,
RwLock: queueTask.RwLock,
ResetImage: queueTask.ResetImage,
ResetImagePolicy: queueTask.ResetImagePolicy,
TriggerBy: queueTask.TriggerBy,
Features: queueTask.Features,
IsRestart: queueTask.IsRestart,
Expand Down Expand Up @@ -115,6 +116,7 @@ func ConvertTaskToQueue(task *task.Task) *commonmodels.Queue {
TestReports: task.TestReports,
RwLock: task.RwLock,
ResetImage: task.ResetImage,
ResetImagePolicy: task.ResetImagePolicy,
TriggerBy: task.TriggerBy,
Features: task.Features,
IsRestart: task.IsRestart,
Expand Down

0 comments on commit 089bf03

Please sign in to comment.