Merge pull request #15502 from ReillyBrogan/debian/bookworm/resolved

Debian 12 Bookworm: Fix DNS resolution
This commit is contained in:
Kubernetes Prow Robot 2023-06-15 19:52:19 -07:00 committed by GitHub
commit 4fdb2103cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions

View File

@ -98,14 +98,16 @@ func (d *Distribution) DefaultUsers() ([]string, error) {
// HasLoopbackEtcResolvConf is true if systemd-resolved has put the loopback address 127.0.0.53 as a nameserver in /etc/resolv.conf
// See https://github.com/coredns/coredns/blob/master/plugin/loop/README.md#troubleshooting-loops-in-kubernetes-clusters
func (d *Distribution) HasLoopbackEtcResolvConf() bool {
if d.IsUbuntu() {
// Ubuntu > 16.04 has it
return d.version > 16.04
}
if d.project == "flatcar" {
switch d.project {
case "debian":
return d.version >= 12
case "ubuntu":
return d.version >= 18.04
case "flatcar":
return true
default:
return false
}
return false
}
// Version returns the (project scoped) numeric version