From f6a99eef7e657e5e49f16ca6f5be592c3d4dae8d Mon Sep 17 00:00:00 2001 From: gitlawr Date: Wed, 7 Mar 2018 14:20:18 +0800 Subject: [PATCH 1/2] add templates field to pipelinespec for import --- apis/management.cattle.io/v3/pipeline_types.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/apis/management.cattle.io/v3/pipeline_types.go b/apis/management.cattle.io/v3/pipeline_types.go index 33faac47..ae0edeac 100644 --- a/apis/management.cattle.io/v3/pipeline_types.go +++ b/apis/management.cattle.io/v3/pipeline_types.go @@ -21,6 +21,8 @@ type Pipeline struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` + ProjectName string `json:"projectName" yaml:"projectName" norman:"required,type=reference[project]"` + Spec PipelineSpec `json:"spec"` Status PipelineStatus `json:"status"` } @@ -31,6 +33,8 @@ type PipelineExecution struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` + ProjectName string `json:"projectName" yaml:"projectName" norman:"required,type=reference[project]"` + Spec PipelineExecutionSpec `json:"spec"` Status PipelineExecutionStatus `json:"status"` } @@ -41,6 +45,8 @@ type PipelineExecutionLog struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` + ProjectName string `json:"projectName" yaml:"projectName" norman:"required,type=reference[project]"` + Spec PipelineExecutionLogSpec `json:"spec"` } @@ -89,14 +95,14 @@ type PipelineStatus struct { } type PipelineSpec struct { - ProjectName string `json:"projectName" yaml:"projectName" norman:"required,type=reference[project]"` - - DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty" norman:"required"` + DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"` TriggerWebhook bool `json:"triggerWebhook,omitempty" yaml:"triggerWebhook,omitempty"` TriggerCronTimezone string `json:"triggerCronTimezone,omitempty" yaml:"triggerCronTimezone,omitempty"` TriggerCronExpression string `json:"triggerCronExpression,omitempty" yaml:"triggerCronExpression,omitempty"` - Stages []Stage `json:"stages,omitempty" yaml:"stages,omitempty" norman:"required"` + Stages []Stage `json:"stages,omitempty" yaml:"stages,omitempty"` + + Templates map[string]string `json:"templates,omitempty" yaml:"templates,omitempty"` } type Stage struct { @@ -135,7 +141,6 @@ type PublishImageConfig struct { } type PipelineExecutionSpec struct { - ProjectName string `json:"projectName" norman:"required,type=reference[project]"` PipelineName string `json:"pipelineName" norman:"required,type=reference[pipeline]"` Run int `json:"run,omitempty" norman:"required,min=1"` TriggeredBy string `json:"triggeredBy,omitempty" norman:"required,options=user|cron|webhook"` @@ -198,8 +203,6 @@ type RepoPerm struct { } type PipelineExecutionLogSpec struct { - ProjectName string `json:"projectName" yaml:"projectName" norman:"required,type=reference[project]"` - PipelineExecutionName string `json:"pipelineExecutionName,omitempty" norman:"type=reference[pipelineExecution]"` Stage int `json:"stage,omitempty" norman:"min=1"` Step int `json:"step,omitempty" norman:"min=1"` From 83b7f58812cbc58ce925e8b25d106ddfb1de6377 Mon Sep 17 00:00:00 2001 From: gitlawr Date: Wed, 7 Mar 2018 14:21:28 +0800 Subject: [PATCH 2/2] update generated --- .../v3/zz_generated_deepcopy.go | 7 +++++++ client/management/v3/zz_generated_pipeline.go | 2 ++ .../v3/zz_generated_pipeline_execution_log_spec.go | 2 -- .../v3/zz_generated_pipeline_execution_spec.go | 2 -- client/management/v3/zz_generated_pipeline_spec.go | 14 +++++++------- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 27165437..cf17885b 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -4069,6 +4069,13 @@ func (in *PipelineSpec) DeepCopyInto(out *PipelineSpec) { (*in)[i].DeepCopyInto(&(*out)[i]) } } + if in.Templates != nil { + in, out := &in.Templates, &out.Templates + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } return } diff --git a/client/management/v3/zz_generated_pipeline.go b/client/management/v3/zz_generated_pipeline.go index 76b46f2f..9a9b34c8 100644 --- a/client/management/v3/zz_generated_pipeline.go +++ b/client/management/v3/zz_generated_pipeline.go @@ -23,6 +23,7 @@ const ( PipelineFieldRemoved = "removed" PipelineFieldStages = "stages" PipelineFieldState = "state" + PipelineFieldTemplates = "templates" PipelineFieldToken = "token" PipelineFieldTransitioning = "transitioning" PipelineFieldTransitioningMessage = "transitioningMessage" @@ -52,6 +53,7 @@ type Pipeline struct { Removed string `json:"removed,omitempty" yaml:"removed,omitempty"` Stages []Stage `json:"stages,omitempty" yaml:"stages,omitempty"` State string `json:"state,omitempty" yaml:"state,omitempty"` + Templates map[string]string `json:"templates,omitempty" yaml:"templates,omitempty"` Token string `json:"token,omitempty" yaml:"token,omitempty"` Transitioning string `json:"transitioning,omitempty" yaml:"transitioning,omitempty"` TransitioningMessage string `json:"transitioningMessage,omitempty" yaml:"transitioningMessage,omitempty"` diff --git a/client/management/v3/zz_generated_pipeline_execution_log_spec.go b/client/management/v3/zz_generated_pipeline_execution_log_spec.go index 6bb00b5a..db82eebb 100644 --- a/client/management/v3/zz_generated_pipeline_execution_log_spec.go +++ b/client/management/v3/zz_generated_pipeline_execution_log_spec.go @@ -5,7 +5,6 @@ const ( PipelineExecutionLogSpecFieldLine = "line" PipelineExecutionLogSpecFieldMessage = "message" PipelineExecutionLogSpecFieldPipelineExecutionId = "pipelineExecutionId" - PipelineExecutionLogSpecFieldProjectId = "projectId" PipelineExecutionLogSpecFieldStage = "stage" PipelineExecutionLogSpecFieldStep = "step" ) @@ -14,7 +13,6 @@ type PipelineExecutionLogSpec struct { Line *int64 `json:"line,omitempty" yaml:"line,omitempty"` Message string `json:"message,omitempty" yaml:"message,omitempty"` PipelineExecutionId string `json:"pipelineExecutionId,omitempty" yaml:"pipelineExecutionId,omitempty"` - ProjectId string `json:"projectId,omitempty" yaml:"projectId,omitempty"` Stage *int64 `json:"stage,omitempty" yaml:"stage,omitempty"` Step *int64 `json:"step,omitempty" yaml:"step,omitempty"` } diff --git a/client/management/v3/zz_generated_pipeline_execution_spec.go b/client/management/v3/zz_generated_pipeline_execution_spec.go index 054228c8..45acf9aa 100644 --- a/client/management/v3/zz_generated_pipeline_execution_spec.go +++ b/client/management/v3/zz_generated_pipeline_execution_spec.go @@ -4,7 +4,6 @@ const ( PipelineExecutionSpecType = "pipelineExecutionSpec" PipelineExecutionSpecFieldPipeline = "pipeline" PipelineExecutionSpecFieldPipelineId = "pipelineId" - PipelineExecutionSpecFieldProjectId = "projectId" PipelineExecutionSpecFieldRun = "run" PipelineExecutionSpecFieldTriggerUserId = "triggerUserId" PipelineExecutionSpecFieldTriggeredBy = "triggeredBy" @@ -13,7 +12,6 @@ const ( type PipelineExecutionSpec struct { Pipeline *Pipeline `json:"pipeline,omitempty" yaml:"pipeline,omitempty"` PipelineId string `json:"pipelineId,omitempty" yaml:"pipelineId,omitempty"` - ProjectId string `json:"projectId,omitempty" yaml:"projectId,omitempty"` Run *int64 `json:"run,omitempty" yaml:"run,omitempty"` TriggerUserId string `json:"triggerUserId,omitempty" yaml:"triggerUserId,omitempty"` TriggeredBy string `json:"triggeredBy,omitempty" yaml:"triggeredBy,omitempty"` diff --git a/client/management/v3/zz_generated_pipeline_spec.go b/client/management/v3/zz_generated_pipeline_spec.go index 51fbd0e9..d6c50570 100644 --- a/client/management/v3/zz_generated_pipeline_spec.go +++ b/client/management/v3/zz_generated_pipeline_spec.go @@ -3,18 +3,18 @@ package client const ( PipelineSpecType = "pipelineSpec" PipelineSpecFieldDisplayName = "displayName" - PipelineSpecFieldProjectId = "projectId" PipelineSpecFieldStages = "stages" + PipelineSpecFieldTemplates = "templates" PipelineSpecFieldTriggerCronExpression = "triggerCronExpression" PipelineSpecFieldTriggerCronTimezone = "triggerCronTimezone" PipelineSpecFieldTriggerWebhook = "triggerWebhook" ) type PipelineSpec struct { - DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"` - ProjectId string `json:"projectId,omitempty" yaml:"projectId,omitempty"` - Stages []Stage `json:"stages,omitempty" yaml:"stages,omitempty"` - TriggerCronExpression string `json:"triggerCronExpression,omitempty" yaml:"triggerCronExpression,omitempty"` - TriggerCronTimezone string `json:"triggerCronTimezone,omitempty" yaml:"triggerCronTimezone,omitempty"` - TriggerWebhook bool `json:"triggerWebhook,omitempty" yaml:"triggerWebhook,omitempty"` + DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"` + Stages []Stage `json:"stages,omitempty" yaml:"stages,omitempty"` + Templates map[string]string `json:"templates,omitempty" yaml:"templates,omitempty"` + TriggerCronExpression string `json:"triggerCronExpression,omitempty" yaml:"triggerCronExpression,omitempty"` + TriggerCronTimezone string `json:"triggerCronTimezone,omitempty" yaml:"triggerCronTimezone,omitempty"` + TriggerWebhook bool `json:"triggerWebhook,omitempty" yaml:"triggerWebhook,omitempty"` }