diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index f951bd03..82c4dc77 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -78,12 +78,12 @@ var ( PipelineSystemImages: projectv3.PipelineSystemImages{ Jenkins: m("rancher/pipeline-jenkins-server:v0.1.0"), JenkinsJnlp: m("jenkins/jnlp-slave:3.10-1-alpine"), - AlpineGit: m("rancher/pipeline-tools:v0.1.0"), + AlpineGit: m("rancher/pipeline-tools:v0.1.2"), PluginsDocker: m("plugins/docker:17.12"), Minio: m("minio/minio:RELEASE.2018-05-25T19-49-13Z"), Registry: m("registry:2"), - RegistryProxy: m("rancher/pipeline-tools:v0.1.0"), - KubeApply: m("rancher/pipeline-tools:v0.1.0"), + RegistryProxy: m("rancher/pipeline-tools:v0.1.2"), + KubeApply: m("rancher/pipeline-tools:v0.1.2"), }, LoggingSystemImages: LoggingSystemImages{ Fluentd: m("rancher/fluentd:v0.1.11"), diff --git a/apis/project.cattle.io/v3/pipeline_types.go b/apis/project.cattle.io/v3/pipeline_types.go index 9b5b570c..fae4de60 100644 --- a/apis/project.cattle.io/v3/pipeline_types.go +++ b/apis/project.cattle.io/v3/pipeline_types.go @@ -226,10 +226,12 @@ type Stage struct { } type Step struct { - SourceCodeConfig *SourceCodeConfig `json:"sourceCodeConfig,omitempty" yaml:"sourceCodeConfig,omitempty"` - RunScriptConfig *RunScriptConfig `json:"runScriptConfig,omitempty" yaml:"runScriptConfig,omitempty"` - PublishImageConfig *PublishImageConfig `json:"publishImageConfig,omitempty" yaml:"publishImageConfig,omitempty"` - ApplyYamlConfig *ApplyYamlConfig `json:"applyYamlConfig,omitempty" yaml:"applyYamlConfig,omitempty"` + SourceCodeConfig *SourceCodeConfig `json:"sourceCodeConfig,omitempty" yaml:"sourceCodeConfig,omitempty"` + RunScriptConfig *RunScriptConfig `json:"runScriptConfig,omitempty" yaml:"runScriptConfig,omitempty"` + PublishImageConfig *PublishImageConfig `json:"publishImageConfig,omitempty" yaml:"publishImageConfig,omitempty"` + ApplyYamlConfig *ApplyYamlConfig `json:"applyYamlConfig,omitempty" yaml:"applyYamlConfig,omitempty"` + PublishCatalogConfig *PublishCatalogConfig `json:"publishCatalogConfig,omitempty" yaml:"publishCatalogConfig,omitempty"` + ApplyAppConfig *ApplyAppConfig `json:"applyAppConfig,omitempty" yaml:"applyAppConfig,omitempty"` Env map[string]string `json:"env,omitempty" yaml:"env,omitempty"` EnvFrom []EnvFrom `json:"envFrom,omitempty" yaml:"envFrom,omitempty"` @@ -269,6 +271,24 @@ type ApplyYamlConfig struct { Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"` } +type PublishCatalogConfig struct { + Path string `json:"path,omitempty" yaml:"path,omitempty"` + Catalog string `json:"catalog,omitempty" yaml:"catalog,omitempty"` + Version string `json:"version,omitempty" yaml:"version,omitempty"` + GitURL string `json:"gitUrl,omitempty" yaml:"gitUrl,omitempty"` + GitBranch string `json:"gitBranch,omitempty" yaml:"gitBranch,omitempty"` + GitAuthor string `json:"gitAuthor,omitempty" yaml:"gitAuthor,omitempty"` + GitEmail string `json:"gitEmail,omitempty" yaml:"gitEmail,omitempty"` +} + +type ApplyAppConfig struct { + Catalog string `json:"catalog,omitempty" yaml:"catalog,omitempty"` + Version string `json:"version,omitempty" yaml:"version,omitempty"` + Answers map[string]string `json:"answers,omitempty" yaml:"answers,omitempty"` + Name string `json:"name,omitempty" yaml:"name,omitempty"` + TargetNamespace string `json:"targetNamespace,omitempty" yaml:"targetNamespace,omitempty"` +} + type PipelineExecutionSpec struct { ProjectName string `json:"projectName" yaml:"projectName" norman:"required,type=reference[project]"`