kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support NodeLocalDNS on IPv6 clusters

This commit is contained in:
John Gardiner Myers 2021-11-27 19:19:29 -08:00
parent 56577a910e
commit a502a37990
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/model/components/kubedns.go
View File

@ -91,7 +91,11 @@ func (b *KubeDnsOptionsBuilder) BuildOptions(o interface{}) error {
nodeLocalDNS.Enabled = fi.Bool(false)
}
if fi.BoolValue(nodeLocalDNS.Enabled) && nodeLocalDNS.LocalIP == "" {
nodeLocalDNS.LocalIP = "169.254.20.10"
if clusterSpec.IsIPv6Only() {
nodeLocalDNS.LocalIP = "fd00:90de:d95::1"
} else {
nodeLocalDNS.LocalIP = "169.254.20.10"
}
}
if fi.BoolValue(nodeLocalDNS.Enabled) && nodeLocalDNS.ForwardToKubeDNS == nil {
nodeLocalDNS.ForwardToKubeDNS = fi.Bool(false)

5
upup/models/cloudup/resources/addons/nodelocaldns.addons.k8s.io/k8s-1.12.yaml.template
View File

@ -54,7 +54,7 @@ data:
force_tcp
}
prometheus :9253
health {{ KubeDNS.NodeLocalDNS.LocalIP }}:{{ NodeLocalDNSHealthCheck }}
health {{ joinHostPort KubeDNS.NodeLocalDNS.LocalIP NodeLocalDNSHealthCheck }}
}
{{- if WithDefaultBool KubeDNS.NodeLocalDNS.ForwardToKubeDNS false }}
.:53 {
@ -99,9 +99,6 @@ data:
bind {{ KubeDNS.NodeLocalDNS.LocalIP }}
forward . __PILLAR__UPSTREAM__SERVERS__
prometheus :9253
{{- if IsIPv6Only }}
dns64
{{- end }}
}
{{- end }}
---

2
upup/pkg/fi/cloudup/template_functions.go
View File

@ -31,6 +31,7 @@ import (
"encoding/base64"
"encoding/json"
"fmt"
"net"
"os"
"path"
"sort"
@ -87,6 +88,7 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
dest["join"] = func(a []string, sep string) string {
return strings.Join(a, sep)
}
dest["joinHostPort"] = net.JoinHostPort
sprigTxtFuncMap := sprig.TxtFuncMap()
dest["nindent"] = sprigTxtFuncMap["nindent"]