From eda6aff21468a049b548d7c6e3437d8981f376ad Mon Sep 17 00:00:00 2001 From: gitlawr Date: Thu, 3 Jan 2019 16:57:26 +0800 Subject: [PATCH] rename catalog field to catalogTemplate in applyApp/publishCatalog step config --- apis/management.cattle.io/v3/k8s_defaults.go | 6 +++--- apis/project.cattle.io/v3/pipeline_types.go | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 8f2117c3..35caba7e 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -92,12 +92,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.2"), + AlpineGit: m("rancher/pipeline-tools:v0.1.4"), 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.2"), - KubeApply: m("rancher/pipeline-tools:v0.1.2"), + RegistryProxy: m("rancher/pipeline-tools:v0.1.4"), + KubeApply: m("rancher/pipeline-tools:v0.1.4"), }, 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 fae4de60..1d647be8 100644 --- a/apis/project.cattle.io/v3/pipeline_types.go +++ b/apis/project.cattle.io/v3/pipeline_types.go @@ -272,17 +272,17 @@ type ApplyYamlConfig struct { } 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"` + Path string `json:"path,omitempty" yaml:"path,omitempty"` + CatalogTemplate string `json:"catalogTemplate,omitempty" yaml:"catalogTemplate,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"` + CatalogTemplate string `json:"catalogTemplate,omitempty" yaml:"catalogTemplate,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"`