From cc8264ecdf08baf17baa023faff87d5d8fa9f561 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Tue, 14 Apr 2020 17:58:00 +0200 Subject: [PATCH 1/2] 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) From 87914a6948db0b0c73c9a5f250a8b5b24215bdb3 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Thu, 16 Apr 2020 16:42:05 +0200 Subject: [PATCH 2/2] generated data --- .../v3/zz_generated_deepcopy.go | 28 +++++++++++++++++++ .../management/v3/zz_generated_dns_config.go | 2 ++ .../management/v3/zz_generated_nodelocal.go | 12 ++++++++ .../v3/zz_generated_rke_system_images.go | 2 ++ 4 files changed, 44 insertions(+) create mode 100644 client/management/v3/zz_generated_nodelocal.go diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 3df3b29e..1fd8e402 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -2671,6 +2671,11 @@ func (in *DNSConfig) DeepCopyInto(out *DNSConfig) { (*out)[key] = val } } + if in.Nodelocal != nil { + in, out := &in.Nodelocal, &out.Nodelocal + *out = new(Nodelocal) + (*in).DeepCopyInto(*out) + } return } @@ -6072,6 +6077,29 @@ func (in *NodeTemplateStatus) DeepCopy() *NodeTemplateStatus { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Nodelocal) DeepCopyInto(out *Nodelocal) { + *out = *in + if in.NodeSelector != nil { + in, out := &in.NodeSelector, &out.NodeSelector + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Nodelocal. +func (in *Nodelocal) DeepCopy() *Nodelocal { + if in == nil { + return nil + } + out := new(Nodelocal) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Notification) DeepCopyInto(out *Notification) { *out = *in diff --git a/client/management/v3/zz_generated_dns_config.go b/client/management/v3/zz_generated_dns_config.go index 45819397..86d745b9 100644 --- a/client/management/v3/zz_generated_dns_config.go +++ b/client/management/v3/zz_generated_dns_config.go @@ -3,6 +3,7 @@ package client const ( DNSConfigType = "dnsConfig" DNSConfigFieldNodeSelector = "nodeSelector" + DNSConfigFieldNodelocal = "nodelocal" DNSConfigFieldProvider = "provider" DNSConfigFieldReverseCIDRs = "reversecidrs" DNSConfigFieldStubDomains = "stubdomains" @@ -11,6 +12,7 @@ const ( type DNSConfig struct { NodeSelector map[string]string `json:"nodeSelector,omitempty" yaml:"nodeSelector,omitempty"` + Nodelocal *Nodelocal `json:"nodelocal,omitempty" yaml:"nodelocal,omitempty"` Provider string `json:"provider,omitempty" yaml:"provider,omitempty"` ReverseCIDRs []string `json:"reversecidrs,omitempty" yaml:"reversecidrs,omitempty"` StubDomains map[string][]string `json:"stubdomains,omitempty" yaml:"stubdomains,omitempty"` diff --git a/client/management/v3/zz_generated_nodelocal.go b/client/management/v3/zz_generated_nodelocal.go new file mode 100644 index 00000000..80b559fd --- /dev/null +++ b/client/management/v3/zz_generated_nodelocal.go @@ -0,0 +1,12 @@ +package client + +const ( + NodelocalType = "nodelocal" + NodelocalFieldIPAddress = "ipAddress" + NodelocalFieldNodeSelector = "nodeSelector" +) + +type Nodelocal struct { + IPAddress string `json:"ipAddress,omitempty" yaml:"ipAddress,omitempty"` + NodeSelector map[string]string `json:"nodeSelector,omitempty" yaml:"nodeSelector,omitempty"` +} diff --git a/client/management/v3/zz_generated_rke_system_images.go b/client/management/v3/zz_generated_rke_system_images.go index 53a0b638..4f22b0b4 100644 --- a/client/management/v3/zz_generated_rke_system_images.go +++ b/client/management/v3/zz_generated_rke_system_images.go @@ -28,6 +28,7 @@ const ( RKESystemImagesFieldKubernetesServicesSidecar = "kubernetesServicesSidecar" RKESystemImagesFieldMetricsServer = "metricsServer" RKESystemImagesFieldNginxProxy = "nginxProxy" + RKESystemImagesFieldNodelocal = "nodelocal" RKESystemImagesFieldPodInfraContainer = "podInfraContainer" RKESystemImagesFieldWeaveCNI = "weaveCni" RKESystemImagesFieldWeaveNode = "weaveNode" @@ -61,6 +62,7 @@ type RKESystemImages struct { KubernetesServicesSidecar string `json:"kubernetesServicesSidecar,omitempty" yaml:"kubernetesServicesSidecar,omitempty"` MetricsServer string `json:"metricsServer,omitempty" yaml:"metricsServer,omitempty"` NginxProxy string `json:"nginxProxy,omitempty" yaml:"nginxProxy,omitempty"` + Nodelocal string `json:"nodelocal,omitempty" yaml:"nodelocal,omitempty"` PodInfraContainer string `json:"podInfraContainer,omitempty" yaml:"podInfraContainer,omitempty"` WeaveCNI string `json:"weaveCni,omitempty" yaml:"weaveCni,omitempty"` WeaveNode string `json:"weaveNode,omitempty" yaml:"weaveNode,omitempty"`