From b50e7361848bba7ad2a10d52d225b8a0a6034445 Mon Sep 17 00:00:00 2001 From: wulonghui Date: Fri, 7 Aug 2015 09:08:56 +0800 Subject: [PATCH] Add NodeInternalIP for Node's Addresses when cloud provider is nil --- pkg/kubelet/kubelet.go | 15 ++++++++++++--- pkg/kubelet/kubelet_test.go | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 179a89200cc..7b8f75a539e 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -1989,7 +1989,10 @@ func (kl *Kubelet) setNodeStatus(node *api.Node) error { } else { addr := net.ParseIP(kl.hostname) if addr != nil { - node.Status.Addresses = []api.NodeAddress{{Type: api.NodeLegacyHostIP, Address: addr.String()}} + node.Status.Addresses = []api.NodeAddress{ + {Type: api.NodeLegacyHostIP, Address: addr.String()}, + {Type: api.NodeInternalIP, Address: addr.String()}, + } } else { addrs, err := net.LookupIP(node.Name) if err != nil { @@ -2005,7 +2008,10 @@ func (kl *Kubelet) setNodeStatus(node *api.Node) error { } if ip.To4() != nil { - node.Status.Addresses = []api.NodeAddress{{Type: api.NodeLegacyHostIP, Address: ip.String()}} + node.Status.Addresses = []api.NodeAddress{ + {Type: api.NodeLegacyHostIP, Address: ip.String()}, + {Type: api.NodeInternalIP, Address: ip.String()}, + } break } } @@ -2016,7 +2022,10 @@ func (kl *Kubelet) setNodeStatus(node *api.Node) error { return err } - node.Status.Addresses = []api.NodeAddress{{Type: api.NodeLegacyHostIP, Address: ip.String()}} + node.Status.Addresses = []api.NodeAddress{ + {Type: api.NodeLegacyHostIP, Address: ip.String()}, + {Type: api.NodeInternalIP, Address: ip.String()}, + } } } } diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 8f1b33b1e2d..2cbf677ff9d 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -2314,7 +2314,10 @@ func TestUpdateNewNodeStatus(t *testing.T) { api.ResourceMemory: *resource.NewQuantity(1024, resource.BinarySI), api.ResourcePods: *resource.NewQuantity(0, resource.DecimalSI), }, - Addresses: []api.NodeAddress{{Type: api.NodeLegacyHostIP, Address: "127.0.0.1"}}, + Addresses: []api.NodeAddress{ + {Type: api.NodeLegacyHostIP, Address: "127.0.0.1"}, + {Type: api.NodeInternalIP, Address: "127.0.0.1"}, + }, }, } @@ -2415,7 +2418,10 @@ func TestUpdateExistingNodeStatus(t *testing.T) { api.ResourceMemory: *resource.NewQuantity(1024, resource.BinarySI), api.ResourcePods: *resource.NewQuantity(0, resource.DecimalSI), }, - Addresses: []api.NodeAddress{{Type: api.NodeLegacyHostIP, Address: "127.0.0.1"}}, + Addresses: []api.NodeAddress{ + {Type: api.NodeLegacyHostIP, Address: "127.0.0.1"}, + {Type: api.NodeInternalIP, Address: "127.0.0.1"}, + }, }, } @@ -2506,7 +2512,10 @@ func TestUpdateNodeStatusWithoutContainerRuntime(t *testing.T) { api.ResourceMemory: *resource.NewQuantity(1024, resource.BinarySI), api.ResourcePods: *resource.NewQuantity(0, resource.DecimalSI), }, - Addresses: []api.NodeAddress{{Type: api.NodeLegacyHostIP, Address: "127.0.0.1"}}, + Addresses: []api.NodeAddress{ + {Type: api.NodeLegacyHostIP, Address: "127.0.0.1"}, + {Type: api.NodeInternalIP, Address: "127.0.0.1"}, + }, }, }