Merge pull request #318 from aiwantaozi/add_logging_image

add tools images to setting

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"`
+}

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

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"`
+}

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"`
+}

apis/management.cattle.io/v3/zz_generated_deepcopy.go

@@ -39,6 +39,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
 			in.(*AlertStatus).DeepCopyInto(out.(*AlertStatus))
 			return nil
 		}, InType: reflect.TypeOf(&AlertStatus{})},
+		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
+			in.(*AlertSystemImages).DeepCopyInto(out.(*AlertSystemImages))
+			return nil
+		}, InType: reflect.TypeOf(&AlertSystemImages{})},
 		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
 			in.(*AuthAppInput).DeepCopyInto(out.(*AuthAppInput))
 			return nil
@@ -391,6 +395,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
 			in.(*LoggingStatus).DeepCopyInto(out.(*LoggingStatus))
 			return nil
 		}, InType: reflect.TypeOf(&LoggingStatus{})},
+		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
+			in.(*LoggingSystemImages).DeepCopyInto(out.(*LoggingSystemImages))
+			return nil
+		}, InType: reflect.TypeOf(&LoggingSystemImages{})},
 		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
 			in.(*NetworkConfig).DeepCopyInto(out.(*NetworkConfig))
 			return nil
@@ -539,6 +547,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
 			in.(*PipelineStatus).DeepCopyInto(out.(*PipelineStatus))
 			return nil
 		}, InType: reflect.TypeOf(&PipelineStatus{})},
+		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
+			in.(*PipelineSystemImages).DeepCopyInto(out.(*PipelineSystemImages))
+			return nil
+		}, InType: reflect.TypeOf(&PipelineSystemImages{})},
 		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
 			in.(*PodSecurityPolicyTemplate).DeepCopyInto(out.(*PodSecurityPolicyTemplate))
 			return nil
@@ -977,6 +989,22 @@ func (in *AlertStatus) DeepCopy() *AlertStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AlertSystemImages) DeepCopyInto(out *AlertSystemImages) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AlertSystemImages.
+func (in *AlertSystemImages) DeepCopy() *AlertSystemImages {
+	if in == nil {
+		return nil
+	}
+	out := new(AlertSystemImages)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AuthAppInput) DeepCopyInto(out *AuthAppInput) {
 	*out = *in
@@ -3299,6 +3327,22 @@ func (in *LoggingStatus) DeepCopy() *LoggingStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *LoggingSystemImages) DeepCopyInto(out *LoggingSystemImages) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LoggingSystemImages.
+func (in *LoggingSystemImages) DeepCopy() *LoggingSystemImages {
+	if in == nil {
+		return nil
+	}
+	out := new(LoggingSystemImages)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *NetworkConfig) DeepCopyInto(out *NetworkConfig) {
 	*out = *in
@@ -4404,6 +4448,22 @@ func (in *PipelineStatus) DeepCopy() *PipelineStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *PipelineSystemImages) DeepCopyInto(out *PipelineSystemImages) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PipelineSystemImages.
+func (in *PipelineSystemImages) DeepCopy() *PipelineSystemImages {
+	if in == nil {
+		return nil
+	}
+	out := new(PipelineSystemImages)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *PodSecurityPolicyTemplate) DeepCopyInto(out *PodSecurityPolicyTemplate) {
 	*out = *in