Skip to content

[release-4.22] OCPBUGS-98328: fix(kubevirt): use only first MachineInternalIP per family in EndpointSlice endpoints #8979

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

Open
openshift-cherrypick-robot wants to merge 1 commit into
base: release-4.22
Choose a base branch
from
+69 −2
Open

[release-4.22] OCPBUGS-98328: fix(kubevirt): use only first MachineInternalIP per family in EndpointSlice endpoints #8979

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
14 changes: 12 additions & 2 deletions control-plane-operator/hostedclusterconfigoperator/controllers/machine/machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,20 @@ func (r *reconciler) reconcileKubevirtPassthroughService(ctx context.Context, hc
log.Info("Skipping link-local address for EndpointSlice", "address", machineAddress.Address, "machine", machine.Name)
continue
}
// Use only the first address per family. CAPK PR #366 exposes all VMI
// interface IPs (for dual-stack CSR approval), including ovn-k8s-mp0
// management port IPs that are not routable from the management cluster.
// This assumes CAPK reports the pod-network IP first; if CAPK changes
// address ordering, this logic must be revisited.
// See: OCPBUGS-95615, kubernetes-sigs/cluster-api-provider-kubevirt#366
if parsedAddr.Is4() {
ipv4MachineAddresses = append(ipv4MachineAddresses, machineAddress.Address)
if len(ipv4MachineAddresses) == 0 {
ipv4MachineAddresses = append(ipv4MachineAddresses, machineAddress.Address)
}
} else {
ipv6MachineAddresses = append(ipv6MachineAddresses, machineAddress.Address)
if len(ipv6MachineAddresses) == 0 {
ipv6MachineAddresses = append(ipv6MachineAddresses, machineAddress.Address)
}
}
}
}
Expand Down
57 changes: 57 additions & 0 deletions control-plane-operator/hostedclusterconfigoperator/controllers/machine/machine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,45 @@ func TestReconcileDefaultIngressEndpoints(t *testing.T) {
},
}

machinesWithExtraInternalIPs := []capiv1.Machine{
{
TypeMeta: machineTypeMeta,
ObjectMeta: worker1Meta,
Spec: capiv1.MachineSpec{
InfrastructureRef: corev1.ObjectReference{
Name: vmWorker1Meta.Name,
},
},
Status: capiv1.MachineStatus{
Phase: string(capiv1.MachinePhaseRunning),
Addresses: []capiv1.MachineAddress{
{Type: capiv1.MachineInternalIP, Address: "192.168.1.3"},
{Type: capiv1.MachineInternalIP, Address: "10.8.20.2"},
{Type: capiv1.MachineInternalIP, Address: "2001:db8:a0b:12f0::3"},
{Type: capiv1.MachineInternalIP, Address: "fd00:10:8::3"},
},
},
},
{
TypeMeta: machineTypeMeta,
ObjectMeta: worker2Meta,
Spec: capiv1.MachineSpec{
InfrastructureRef: corev1.ObjectReference{
Name: vmWorker2Meta.Name,
},
},
Status: capiv1.MachineStatus{
Phase: string(capiv1.MachinePhaseRunning),
Addresses: []capiv1.MachineAddress{
{Type: capiv1.MachineInternalIP, Address: "192.168.1.4"},
{Type: capiv1.MachineInternalIP, Address: "10.8.0.2"},
{Type: capiv1.MachineInternalIP, Address: "2001:db8:a0b:12f0::4"},
{Type: capiv1.MachineInternalIP, Address: "fd00:10:8::4"},
},
},
},
}

testCases := []struct {
name string
machines []capiv1.Machine
Expand Down Expand Up @@ -495,6 +534,24 @@ func TestReconcileDefaultIngressEndpoints(t *testing.T) {
},
hcp: kubevirtHCP,
},
{
name: "When machines have multiple same-family InternalIPs it should use only the first per family",
machines: machinesWithExtraInternalIPs,
virtualMachines: pairOfVirtualMachines,
services: []corev1.Service{defaultIngressService, kccmService},
expectedServices: []corev1.Service{defaultIngressService, kccmService},
expectedIngressEndpointSlices: []discoveryv1.EndpointSlice{
defaultIngressEndpointSliceIPv4(machinesWithExtraInternalIPs[0], pairOfVirtualMachines[0]),
defaultIngressEndpointSliceIPv4(machinesWithExtraInternalIPs[1], pairOfVirtualMachines[1]),
defaultIngressEndpointSliceIPv6(machinesWithExtraInternalIPs[0], pairOfVirtualMachines[0]),
defaultIngressEndpointSliceIPv6(machinesWithExtraInternalIPs[1], pairOfVirtualMachines[1]),
kccmEndpointSliceIPv4(machinesWithExtraInternalIPs[0], pairOfVirtualMachines[0]),
kccmEndpointSliceIPv4(machinesWithExtraInternalIPs[1], pairOfVirtualMachines[1]),
kccmEndpointSliceIPv6(machinesWithExtraInternalIPs[0], pairOfVirtualMachines[0]),
kccmEndpointSliceIPv6(machinesWithExtraInternalIPs[1], pairOfVirtualMachines[1]),
},
hcp: kubevirtHCP,
},
{
name: "Should remove orphan endpoint slices",
machines: pairOfDualStackRunningMachines,
Expand Down
Loading