Skip to content

Commit

Permalink
Merge pull request #8543 from hakman/automated-cherry-pick-of-#8353-u…
Browse files Browse the repository at this point in the history
…pstream-release-1.16

Automated cherry pick of #8353: Fix DNS loop on Ubuntu 18.04 (Bionic)
  • Loading branch information
k8s-ci-robot committed Feb 15, 2020
2 parents ef44395 + 8bd83cd commit ebef815
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions nodeup/pkg/model/kubelet.go
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,12 @@ func (b *KubeletBuilder) buildKubeletConfigSpec() (*kops.KubeletConfigSpec, erro
}
}

// In certain configurations systemd-resolved will put the loopback address 127.0.0.53 as a nameserver into /etc/resolv.conf
// https://github.com/coredns/coredns/blob/master/plugin/loop/README.md#troubleshooting-loops-in-kubernetes-clusters
if b.Distribution == distros.DistributionBionic && c.ResolverConfig == nil {
c.ResolverConfig = s("/run/systemd/resolve/resolv.conf")
}

// As of 1.16 we can no longer set critical labels.
// kops-controller will set these labels.
// For bootstrapping reasons, protokube sets the critical labels for kops-controller to run.
Expand Down

0 comments on commit ebef815

Please sign in to comment.