From ceb33bde29f54a33a6d51efdb3a8669023d31f02 Mon Sep 17 00:00:00 2001 From: Ricky Pai Date: Mon, 14 Aug 2017 14:37:27 -0700 Subject: [PATCH] refactor entries added by hostAlias into a separate method and be explicit about the source --- pkg/kubelet/kubelet_pods.go | 13 +++++++++++++ pkg/kubelet/kubelet_pods_test.go | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go index c7588e30f91..34847d84883 100644 --- a/pkg/kubelet/kubelet_pods.go +++ b/pkg/kubelet/kubelet_pods.go @@ -266,6 +266,19 @@ func managedHostsFileContent(hostIP, hostName, hostDomainName string, hostAliase } else { buffer.WriteString(fmt.Sprintf("%s\t%s\n", hostIP, hostName)) } + hostsFileContent := buffer.Bytes() + hostsFileContent = append(hostsFileContent, hostsEntriesFromHostAliases(hostAliases)...) + return hostsFileContent +} + +func hostsEntriesFromHostAliases(hostAliases []v1.HostAlias) []byte { + if len(hostAliases) == 0 { + return []byte{} + } + + var buffer bytes.Buffer + buffer.WriteString("\n") + buffer.WriteString("# Entries added by HostAliases.\n") // write each IP/hostname pair as an entry into hosts file for _, hostAlias := range hostAliases { for _, hostname := range hostAlias.Hostnames { diff --git a/pkg/kubelet/kubelet_pods_test.go b/pkg/kubelet/kubelet_pods_test.go index eb9558706ae..83a48fde143 100644 --- a/pkg/kubelet/kubelet_pods_test.go +++ b/pkg/kubelet/kubelet_pods_test.go @@ -287,6 +287,8 @@ fe00::0 ip6-mcastprefix fe00::1 ip6-allnodes fe00::2 ip6-allrouters 203.0.113.1 podFoo.domainFoo podFoo + +# Entries added by HostAliases. 123.45.67.89 foo 123.45.67.89 bar 123.45.67.89 baz @@ -308,6 +310,8 @@ fe00::0 ip6-mcastprefix fe00::1 ip6-allnodes fe00::2 ip6-allrouters 203.0.113.1 podFoo.domainFoo podFoo + +# Entries added by HostAliases. 123.45.67.89 foo 123.45.67.89 bar 123.45.67.89 baz