From 79c7a790dedb75dd5ab1c68de609be9d14261152 Mon Sep 17 00:00:00 2001
From: michelia feng <michelia.feng@gmail.com>
Date: Thu, 12 Sep 2019 10:57:22 +0800
Subject: [PATCH] Remove alerting and logging image from system tools types
 because they deploy by system-charts now

Problem:
system tools is include in rancher-image.txt generated image list, legacy code cause useless image in rancher-image.txt

Solution:
remove logging and alert from tools image in rancher

Issue:
https://github.com/rancher/rancher/issues/22816
---
 apis/management.cattle.io/v3/alerting_types.go      |  5 -----
 apis/management.cattle.io/v3/logging_types.go       |  9 ---------
 apis/management.cattle.io/v3/tools_system_images.go | 11 -----------
 3 files changed, 25 deletions(-)

diff --git a/apis/management.cattle.io/v3/alerting_types.go b/apis/management.cattle.io/v3/alerting_types.go
index daf75394..1f839ac2 100644
--- a/apis/management.cattle.io/v3/alerting_types.go
+++ b/apis/management.cattle.io/v3/alerting_types.go
@@ -317,11 +317,6 @@ type WechatConfig struct {
 type NotifierStatus struct {
 }
 
-type AlertSystemImages struct {
-	AlertManager       string `json:"alertManager,omitempty"`
-	AlertManagerHelper string `json:"alertManagerHelper,omitempty"`
-}
-
 // HTTPClientConfig configures an HTTP client.
 type HTTPClientConfig struct {
 	// HTTP proxy server to use to connect to the targets.
diff --git a/apis/management.cattle.io/v3/logging_types.go b/apis/management.cattle.io/v3/logging_types.go
index 7df54836..db476999 100644
--- a/apis/management.cattle.io/v3/logging_types.go
+++ b/apis/management.cattle.io/v3/logging_types.go
@@ -176,15 +176,6 @@ type CustomTargetConfig struct {
 	ClientKey   string `json:"clientKey,omitempty"`
 }
 
-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"`
-	LogAggregatorFlexVolumeDriver string `json:"logAggregatorFlexVolumeDriver,omitempty"`
-}
-
 type ClusterTestInput struct {
 	ClusterName string `json:"clusterId" norman:"required,type=reference[cluster]"`
 	LoggingTargets
diff --git a/apis/management.cattle.io/v3/tools_system_images.go b/apis/management.cattle.io/v3/tools_system_images.go
index 030948e7..bf10abbc 100644
--- a/apis/management.cattle.io/v3/tools_system_images.go
+++ b/apis/management.cattle.io/v3/tools_system_images.go
@@ -9,15 +9,9 @@ var (
 	m = image.Mirror
 
 	ToolsSystemImages = struct {
-		AlertSystemImages    AlertSystemImages
 		PipelineSystemImages projectv3.PipelineSystemImages
-		LoggingSystemImages  LoggingSystemImages
 		AuthSystemImages     AuthSystemImages
 	}{
-		AlertSystemImages: AlertSystemImages{
-			AlertManager:       m("prom/alertmanager:v0.15.2"),
-			AlertManagerHelper: m("rancher/alertmanager-helper:v0.0.2"),
-		},
 		PipelineSystemImages: projectv3.PipelineSystemImages{
 			Jenkins:       m("rancher/pipeline-jenkins-server:v0.1.4"),
 			JenkinsJnlp:   m("jenkins/jnlp-slave:3.10-1-alpine"),
@@ -28,11 +22,6 @@ var (
 			RegistryProxy: m("rancher/pipeline-tools:v0.1.12"),
 			KubeApply:     m("rancher/pipeline-tools:v0.1.12"),
 		},
-		LoggingSystemImages: LoggingSystemImages{
-			Fluentd:                       m("rancher/fluentd:v0.1.11"),
-			FluentdHelper:                 m("rancher/fluentd-helper:v0.1.2"),
-			LogAggregatorFlexVolumeDriver: m("rancher/log-aggregator:v0.1.4"),
-		},
 		AuthSystemImages: AuthSystemImages{
 			KubeAPIAuth: m("rancher/kube-api-auth:v0.1.3"),
 		},