Skip to content

Commit

Permalink
Merge pull request #15502 from ReillyBrogan/debian/bookworm/resolved
Browse files Browse the repository at this point in the history
Debian 12 Bookworm: Fix DNS resolution
  • Loading branch information
k8s-ci-robot committed Jun 16, 2023
2 parents 0762730 + a7e9c58 commit 4fdb210
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions util/pkg/distributions/distributions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4fdb210

Please sign in to comment.