diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index bd52e6b9..1ba480e0 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -67,11 +67,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("alpine/git:1.0.4"), - PluginsDocker: m("rancher/pipeline-docker-publish:v0.2.0"), + AlpineGit: m("rancher/pipeline-tools:v0.1.0"), + PluginsDocker: m("plugins/docker:17.12"), Minio: m("minio/minio:RELEASE.2018-05-25T19-49-13Z"), Registry: m("registry:2"), - KubeApply: m("rancher/pipeline-kube-apply:v0.2.0"), + RegistryProxy: m("rancher/pipeline-tools:v0.1.0"), + KubeApply: m("rancher/pipeline-tools:v0.1.0"), }, LoggingSystemImages: LoggingSystemImages{ Fluentd: m("rancher/fluentd:v0.1.10"), diff --git a/apis/project.cattle.io/v3/pipeline_types.go b/apis/project.cattle.io/v3/pipeline_types.go index 1056c4c9..f0c5fd74 100644 --- a/apis/project.cattle.io/v3/pipeline_types.go +++ b/apis/project.cattle.io/v3/pipeline_types.go @@ -336,6 +336,7 @@ type PipelineSystemImages struct { PluginsDocker string `json:"pluginsDocker,omitempty"` Minio string `json:"minio,omitempty"` Registry string `json:"registry,omitempty"` + RegistryProxy string `json:"registryProxy,omitempty"` KubeApply string `json:"kubeApply,omitempty"` }