rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-08-13 02:05:18 +00:00
Code Issues Releases Wiki Activity

rename catalog field to catalogTemplate in applyApp/publishCatalog step config

Browse Source
This commit is contained in:
gitlawr 2019-01-03 16:57:26 +08:00 committed by Alena Prokharchyk
parent 0fe6b540ae
commit eda6aff214
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apis/management.cattle.io/v3/k8s_defaults.go
View File

@ -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"),

16
apis/project.cattle.io/v3/pipeline_types.go
View File

@ -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"`