diff --git a/apis/management.cattle.io/v3/globaldns_types.go b/apis/management.cattle.io/v3/globaldns_types.go index fdfe6057..4326ce9d 100644 --- a/apis/management.cattle.io/v3/globaldns_types.go +++ b/apis/management.cattle.io/v3/globaldns_types.go @@ -70,7 +70,3 @@ type AlidnsProviderConfig struct { AccessKey string `json:"accessKey" norman:"notnullable,required,minLength=1"` SecretKey string `json:"secretKey" norman:"notnullable,required,minLength=1,type=password"` } - -type GlobalDNSSystemImages struct { - ExternalDNS string `yaml:"ExternalDns" json:"ExternalDns,omitempty"` -} diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 7aab8731..b8159441 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -89,10 +89,9 @@ var ( // ToolsSystemImages default images for alert, pipeline, logging, globaldns ToolsSystemImages = struct { - AlertSystemImages AlertSystemImages - PipelineSystemImages projectv3.PipelineSystemImages - LoggingSystemImages LoggingSystemImages - GlobalDNSSystemImages GlobalDNSSystemImages + AlertSystemImages AlertSystemImages + PipelineSystemImages projectv3.PipelineSystemImages + LoggingSystemImages LoggingSystemImages }{ AlertSystemImages: AlertSystemImages{ AlertManager: m("prom/alertmanager:v0.15.2"), @@ -113,9 +112,6 @@ var ( FluentdHelper: m("rancher/fluentd-helper:v0.1.2"), LogAggregatorFlexVolumeDriver: m("rancher/log-aggregator:v0.1.4"), }, - GlobalDNSSystemImages: GlobalDNSSystemImages{ - ExternalDNS: m("registry.opensource.zalan.do/teapot/external-dns:v0.5.10"), - }, } AllK8sVersions = map[string]RKESystemImages{ diff --git a/image/mirror.go b/image/mirror.go index a220ff0f..77f60cec 100644 --- a/image/mirror.go +++ b/image/mirror.go @@ -20,7 +20,6 @@ func Mirror(image string) string { image = strings.Replace(image, "alpine/git", "rancher/alpine-git", 1) image = strings.Replace(image, "prom/", "rancher/prom-", 1) image = strings.Replace(image, "quay.io/pires", "rancher", 1) - image = strings.Replace(image, "registry.opensource.zalan.do/teapot/external-dns", "rancher/kubernetes-external-dns", 1) Mirrors[image] = orig return image