Skip to content

Add support to IPv6 in Machine's status #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Aug 14, 2023
Merged

Add support to IPv6 in Machine's status #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions pkg/cloud/services/compute/instance_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,16 +152,10 @@ func (is *InstanceStatus) NetworkStatus() (*InstanceNetworkStatus, error) {
return nil, fmt.Errorf("error unmarshalling addresses for instance %s: %w", is.ID(), err)
}

var addresses []corev1.NodeAddress
var IPv4addresses, IPv6addresses []corev1.NodeAddress
for i := range interfaceList {
address := &interfaceList[i]

// Only consider IPv4
if address.Version != 4 {
is.logger.V(6).Info("Ignoring IP address: only IPv4 is supported", "version", address.Version, "address", address.Address)
continue
}

var addressType corev1.NodeAddressType
switch address.Type {
case "floating":
Expand All @@ -172,14 +166,20 @@ func (is *InstanceStatus) NetworkStatus() (*InstanceNetworkStatus, error) {
is.logger.V(6).Info("Ignoring address with unknown type", "address", address.Address, "type", address.Type)
continue
}

addresses = append(addresses, corev1.NodeAddress{
Type: addressType,
Address: address.Address,
})
if address.Version == 4 {
IPv4addresses = append(IPv4addresses, corev1.NodeAddress{
Type: addressType,
Address: address.Address,
})
} else {
IPv6addresses = append(IPv6addresses, corev1.NodeAddress{
Type: addressType,
Address: address.Address,
})
}
}

addressesByNetwork[networkName] = addresses
// Maintain IPv4 addresses being first ones on Machine's status given there are operations, e.g. reconcile load-balancer member, that use the first address by network type
addressesByNetwork[networkName] = append(IPv4addresses, IPv6addresses...)
}

return &InstanceNetworkStatus{addressesByNetwork}, nil
Expand Down
12 changes: 10 additions & 2 deletions pkg/cloud/services/compute/instance_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func TestNetworkStatus_Addresses(t *testing.T) {
},
},
{
name: "Ignore IPv6",
name: "Multiple Fixed IP and Floating IP",
addresses: map[string][]networkAddress{
"primary": {
{
Expand All @@ -133,6 +133,14 @@ func TestNetworkStatus_Addresses(t *testing.T) {
Type: corev1.NodeInternalIP,
Address: "192.168.0.1",
},
{
Type: corev1.NodeInternalIP,
Address: "fe80::f816:3eff:fe56:3174",
},
{
Type: corev1.NodeExternalIP,
Address: "fe80::f816:3eff:fe56:3175",
},
},
},
{
Expand Down Expand Up @@ -248,7 +256,7 @@ func TestInstanceNetworkStatus(t *testing.T) {
wantFloatingIP: "10.0.0.1",
},
{
name: "Ignore IPv6",
name: "Multiple Fixed IP and Floating IP",
addresses: map[string][]networkAddress{
"primary": {
{
Expand Down