mirror of
https://github.com/rancher/types.git
synced 2025-07-01 07:51:48 +00:00
Merge pull request #286 from gitlawr/pipeline_yaml
Add templates field in pipelinespec
This commit is contained in:
commit
b3ac73ae45
@ -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"`
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
|
@ -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"`
|
||||
|
@ -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"`
|
||||
}
|
||||
|
@ -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"`
|
||||
|
@ -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"`
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user