Skip to content

Commit 33f6e22

Browse files
committed
fix: bond setting change detection
Ignore primaryIndex unless it's both configured and set in the kernel. I think we should never actually set primaryIndex in any case, but this fixes an issue with Talos gets into a loop trying to reconcile primaryIndex (when kernel reports it, and we don't have it set). This comes from a private user report. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com> (cherry picked from commit f0f4207)
1 parent d5be50a commit 33f6e22

File tree

1 file changed

+0
-4
lines changed
  • pkg/machinery/resources/network

1 file changed

+0
-4
lines changed

pkg/machinery/resources/network/link.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,6 @@ func (spec *BondMasterSpec) Equal(other *BondMasterSpec) bool {
115115
return false
116116
}
117117

118-
if (spec.PrimaryIndex == nil) != (other.PrimaryIndex == nil) {
119-
return false
120-
}
121-
122118
if spec.PrimaryIndex != nil && other.PrimaryIndex != nil && *spec.PrimaryIndex != *other.PrimaryIndex {
123119
return false
124120
}

0 commit comments

Comments
 (0)