1
0
mirror of https://github.com/rancher/types.git synced 2025-09-12 13:03:45 +00:00

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
This commit is contained in:
michelia feng
2019-09-12 10:57:22 +08:00
committed by Alena Prokharchyk
parent bba8483953
commit 79c7a790de
3 changed files with 0 additions and 25 deletions

View File

@@ -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.

View File

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

View File

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