ceph: use node externalIP if no internalIP defined

In some cases node internalIP is not defined. Then use externalIP if it
exists.

Signed-off-by: JrCs <90z7oey02@sneakemail.com>
This commit is contained in:
JrCs committed 2021-09-08 16:26:05 +02:00
1 parent d0366dc18a
commit c606f4c488
2 files changed
+38 -11

No files matched your search

+13 -1
View File
@@ -34,8 +34,20 @@ func getNodeInfoFromNode(n v1.Node) (*MonScheduleInfo, error) {
break
}
}
// If no internal IP found try to use an external IP
if nr.Address == "" {
return nil, errors.Errorf("failed to find any internal IP on node %s", nr.Name)
for _, ip := range n.Status.Addresses {
if ip.Type == v1.NodeExternalIP {
logger.Debugf("using external IP %s for node %s", ip.Address, n.Name)
nr.Address = ip.Address
break
}
}
}
if nr.Address == "" {
return nil, errors.Errorf("failed to find any IP on node %s", nr.Name)
}
return nr, nil
}
+25 -10
View File
@@ -23,7 +23,7 @@ import (
"testing"
cephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1"
"github.com/rook/rook/pkg/apis/rook.io"
rook "github.com/rook/rook/pkg/apis/rook.io"
"github.com/rook/rook/pkg/clusterd"
clienttest "github.com/rook/rook/pkg/daemon/ceph/client/test"
cephver "github.com/rook/rook/pkg/operator/ceph/version"
@@ -214,20 +214,35 @@ func TestGetNodeInfoFromNode(t *testing.T) {
assert.NotNil(t, node)
node.Status = v1.NodeStatus{}
node.Status.Addresses = []v1.NodeAddress{
{
Type: v1.NodeExternalIP,
Address: "1.1.1.1",
},
}
node.Status.Addresses = []v1.NodeAddress{}
var info *MonScheduleInfo
_, err = getNodeInfoFromNode(*node)
assert.NotNil(t, err)
node.Status.Addresses[0].Type = v1.NodeInternalIP
node.Status.Addresses[0].Address = "172.17.0.1"
// With internalIP and externalIP
node.Status.Addresses = []v1.NodeAddress{
{
Type: v1.NodeExternalIP,
Address: "1.1.1.1",
},
{
Type: v1.NodeInternalIP,
Address: "172.17.0.1",
},
}
info, err = getNodeInfoFromNode(*node)
assert.NoError(t, err)
assert.Equal(t, "172.17.0.1", info.Address)
assert.Equal(t, "172.17.0.1", info.Address) // Must return the internalIP
// With externalIP only
node.Status.Addresses = []v1.NodeAddress{
{
Type: v1.NodeExternalIP,
Address: "1.2.3.4",
},
}
info, err = getNodeInfoFromNode(*node)
assert.NoError(t, err)
assert.Equal(t, "1.2.3.4", info.Address)
}