Skip to content

Commit 30e2594

Browse files
authored
Merge pull request #81 from jtherin/release-0.20-pick-80
fix: keep internal ip when external ip
2 parents b725ddd + 38c67ff commit 30e2594

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

scaleway/servers.go

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,18 @@ func (s *servers) InstanceShutdown(ctx context.Context, node *v1.Node) (bool, er
212212
// Use the node.name or node.spec.providerID field to find the node in the cloud provider.
213213
func (s *servers) InstanceMetadata(ctx context.Context, node *v1.Node) (*cloudprovider.InstanceMetadata, error) {
214214
if address, ok := node.Labels[nodeLabelNodePublicIP]; ok {
215+
addresses := []v1.NodeAddress{
216+
{Type: v1.NodeExternalIP, Address: address},
217+
}
218+
219+
for _, address := range node.Status.Addresses {
220+
if address.Type != v1.NodeExternalIP {
221+
addresses = append(addresses, address)
222+
}
223+
}
224+
215225
return &cloudprovider.InstanceMetadata{
216-
NodeAddresses: []v1.NodeAddress{{
217-
Type: v1.NodeExternalIP,
218-
Address: address,
219-
}},
226+
NodeAddresses: addresses,
220227
}, nil
221228
}
222229

0 commit comments

Comments
 (0)