From f6a99eef7e657e5e49f16ca6f5be592c3d4dae8d Mon Sep 17 00:00:00 2001 From: gitlawr Date: Wed, 7 Mar 2018 14:20:18 +0800 Subject: [PATCH] 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"`