From e7c8b74b4c76a11991d9dd47348c7bb8d76202b3 Mon Sep 17 00:00:00 2001 From: Aiwantaozi Date: Tue, 27 Mar 2018 12:05:33 +0800 Subject: [PATCH] add tools images to setting --- .../management.cattle.io/v3/alerting_types.go | 5 ++++ apis/management.cattle.io/v3/k8s_defaults.go | 25 +++++++++++++++++++ apis/management.cattle.io/v3/logging_types.go | 8 ++++++ .../management.cattle.io/v3/pipeline_types.go | 7 ++++++ 4 files changed, 45 insertions(+) diff --git a/apis/management.cattle.io/v3/alerting_types.go b/apis/management.cattle.io/v3/alerting_types.go index 0467ac6b..b61bf761 100644 --- a/apis/management.cattle.io/v3/alerting_types.go +++ b/apis/management.cattle.io/v3/alerting_types.go @@ -156,3 +156,8 @@ type WebhookConfig struct { type NotifierStatus struct { } + +type AlertSystemImages struct { + AlertManager string `json:"alertManager,omitempty"` + AlertManagerHelper string `json:"alertManagerHelper,omitempty"` +} diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 0033998c..e6e2b117 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -20,6 +20,31 @@ var ( "v1.9.5-rancher1-1": v19SystemImages, } + // ToolsSystemImages default images for alert, pipeline, logging + ToolsSystemImages = struct { + AlertSystemImages AlertSystemImages + PipelineSystemImages PipelineSystemImages + LoggingSystemImages LoggingSystemImages + }{ + AlertSystemImages: AlertSystemImages{ + AlertManager: "prom/alertmanager:v0.11.0", + AlertManagerHelper: "rancher/alertmanager-helper:v0.0.2", + }, + PipelineSystemImages: PipelineSystemImages{ + Jenkins: "jenkins/jenkins:lts", + JenkinsJnlp: "jenkins/jnlp-slave:3.10-1-alpine", + AlpineGit: "alpine/git", + PluginsDocker: "plugins/docker", + }, + LoggingSystemImages: LoggingSystemImages{ + Fluentd: "rancher/fluentd:v0.1.4", + FluentdHelper: "rancher/fluentd-helper:v0.1.1", + Elaticsearch: "rancher/docker-elasticsearch-kubernetes:5.6.2", + Kibana: "kibana:5.6.4", + Busybox: "busybox", + }, + } + // v18 system images defaults v18SystemImages = RKESystemImages{ Etcd: "rancher/coreos-etcd:v3.0.17", diff --git a/apis/management.cattle.io/v3/logging_types.go b/apis/management.cattle.io/v3/logging_types.go index aba12e30..0ae2bbbf 100644 --- a/apis/management.cattle.io/v3/logging_types.go +++ b/apis/management.cattle.io/v3/logging_types.go @@ -119,3 +119,11 @@ type SyslogConfig struct { Program string `json:"program,omitempty"` Protocol string `json:"protocol,omitempty" norman:"default=udp,type=enum,options=udp|tcp"` } + +type LoggingSystemImages struct { + Fluentd string `json:"fluentd,omitempty"` + FluentdHelper string `json:"fluentdHelper,omitempty"` + Elaticsearch string `json:"elaticsearch,omitempty"` + Kibana string `json:"kibana,omitempty"` + Busybox string `json:"busybox,omitempty"` +} diff --git a/apis/management.cattle.io/v3/pipeline_types.go b/apis/management.cattle.io/v3/pipeline_types.go index 67f2c4d9..a151e67f 100644 --- a/apis/management.cattle.io/v3/pipeline_types.go +++ b/apis/management.cattle.io/v3/pipeline_types.go @@ -235,3 +235,10 @@ type AuthUserInput struct { RedirectURL string `json:"redirectUrl,omitempty" norman:"type=string"` Code string `json:"code,omitempty" norman:"type=string,required"` } + +type PipelineSystemImages struct { + Jenkins string `json:"jenkins,omitempty"` + JenkinsJnlp string `json:"jenkinsJnlp,omitempty"` + AlpineGit string `json:"alpineGit,omitempty"` + PluginsDocker string `json:"pluginsDocker,omitempty"` +}