From cc8264ecdf08baf17baa023faff87d5d8fa9f561 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Tue, 14 Apr 2020 17:58:00 +0200 Subject: [PATCH] Add nodelocal DNS --- apis/management.cattle.io/v3/rke_types.go | 11 +++++++++++ image/mirror.go | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go index 680ab570..ea13ae8a 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -114,6 +114,8 @@ type RKESystemImages struct { CoreDNS string `yaml:"coredns" json:"coredns,omitempty"` // CoreDNS autoscaler image CoreDNSAutoscaler string `yaml:"coredns_autoscaler" json:"corednsAutoscaler,omitempty"` + // Nodelocal image + Nodelocal string `yaml:"nodelocal" json:"nodelocal,omitempty"` // Kubernetes image Kubernetes string `yaml:"kubernetes" json:"kubernetes,omitempty"` // Flannel image @@ -818,6 +820,15 @@ type DNSConfig struct { StubDomains map[string][]string `yaml:"stubdomains" json:"stubdomains,omitempty"` // NodeSelector key pair NodeSelector map[string]string `yaml:"node_selector" json:"nodeSelector,omitempty"` + // Nodelocal DNS + Nodelocal *Nodelocal `yaml:"nodelocal" json:"nodelocal,omitempy"` +} + +type Nodelocal struct { + // link-local IP for nodelocal DNS + IPAddress string `yaml:"ip_address" json:"ipAddress,omitempy"` + // NodeSelector key pair + NodeSelector map[string]string `yaml:"node_selector" json:"nodeSelector,omitempty"` } type RKETaint struct { diff --git a/image/mirror.go b/image/mirror.go index 289d0666..6321d12d 100644 --- a/image/mirror.go +++ b/image/mirror.go @@ -13,7 +13,9 @@ func Mirror(image string) string { image = strings.Replace(image, "gcr.io/google_containers", "rancher", 1) image = strings.Replace(image, "quay.io/coreos/", "rancher/coreos-", 1) image = strings.Replace(image, "quay.io/calico/", "rancher/calico-", 1) - image = strings.Replace(image, "k8s.gcr.io/", "rancher/nginx-ingress-controller-", 1) + image = strings.Replace(image, "plugins/docker", "rancher/plugins-docker", 1) + image = strings.Replace(image, "k8s.gcr.io/defaultbackend", "rancher/nginx-ingress-controller-defaultbackend", 1) + image = strings.Replace(image, "k8s.gcr.io/k8s-dns-node-cache", "rancher/k8s-dns-node-cache", 1) image = strings.Replace(image, "plugins/docker", "rancher/plugins-docker", 1) image = strings.Replace(image, "kibana", "rancher/kibana", 1) image = strings.Replace(image, "jenkins/", "rancher/jenkins-", 1)