github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12374 from wulonghui/wulonghui-patch-1

Browse Source 
Add NodeInternalIP for Node's Addresses when cloud provider is nil
This commit is contained in:
Marek Grabowski 2015-08-10 15:01:00 +02:00
commit 8580e17ff1
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/kubelet/kubelet.go
View File

@ -2009,7 +2009,10 @@ func (kl *Kubelet) setNodeStatus(node *api.Node) error {
} else { } else {
addr := net.ParseIP(kl.hostname) addr := net.ParseIP(kl.hostname)
if addr != nil { 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 { } else {
addrs, err := net.LookupIP(node.Name) addrs, err := net.LookupIP(node.Name)
if err != nil { if err != nil {
@ -2025,7 +2028,10 @@ func (kl *Kubelet) setNodeStatus(node *api.Node) error {
} }
if ip.To4() != nil { 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 break
} }
} }
@ -2036,7 +2042,10 @@ func (kl *Kubelet) setNodeStatus(node *api.Node) error {
return err 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()},
}
} }
} }
} }

15
pkg/kubelet/kubelet_test.go
View File

@ -2314,7 +2314,10 @@ func TestUpdateNewNodeStatus(t *testing.T) {
api.ResourceMemory: *resource.NewQuantity(1024, resource.BinarySI), api.ResourceMemory: *resource.NewQuantity(1024, resource.BinarySI),
api.ResourcePods: *resource.NewQuantity(0, resource.DecimalSI), 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.ResourceMemory: *resource.NewQuantity(1024, resource.BinarySI),
api.ResourcePods: *resource.NewQuantity(0, resource.DecimalSI), 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.ResourceMemory: *resource.NewQuantity(1024, resource.BinarySI),
api.ResourcePods: *resource.NewQuantity(0, resource.DecimalSI), 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"},
},
}, },
} }