From 2c58759d0527f58c682d6bb35d63e0c70b3f1685 Mon Sep 17 00:00:00 2001 From: gitlawr Date: Sun, 3 Feb 2019 21:14:33 +0800 Subject: [PATCH] Add globaldns system images --- apis/management.cattle.io/v3/globaldns_types.go | 4 ++++ apis/management.cattle.io/v3/k8s_defaults.go | 12 ++++++++---- image/mirror.go | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/apis/management.cattle.io/v3/globaldns_types.go b/apis/management.cattle.io/v3/globaldns_types.go index ab47538b..e8998004 100644 --- a/apis/management.cattle.io/v3/globaldns_types.go +++ b/apis/management.cattle.io/v3/globaldns_types.go @@ -68,3 +68,7 @@ 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 e419b972..ea8f2a7f 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -84,11 +84,12 @@ var ( }, } - // ToolsSystemImages default images for alert, pipeline, logging + // ToolsSystemImages default images for alert, pipeline, logging, globaldns ToolsSystemImages = struct { - AlertSystemImages AlertSystemImages - PipelineSystemImages projectv3.PipelineSystemImages - LoggingSystemImages LoggingSystemImages + AlertSystemImages AlertSystemImages + PipelineSystemImages projectv3.PipelineSystemImages + LoggingSystemImages LoggingSystemImages + GlobalDNSSystemImages GlobalDNSSystemImages }{ AlertSystemImages: AlertSystemImages{ AlertManager: m("prom/alertmanager:v0.15.2"), @@ -109,6 +110,9 @@ 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 77f60cec..a220ff0f 100644 --- a/image/mirror.go +++ b/image/mirror.go @@ -20,6 +20,7 @@ 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