fix: bond config via platform

smira · smira · commit dedd273dfcd5 · 2026-01-21T16:20:18.000+04:00
Call `FillDefaults` on platform-acquired bond config. As platform config controller might have cached (saved) representation of bond config, we need to ensure we adapt it to the latest bond configuration. In particular, new fields introduced in v1.12 require some values to be set which `.FillDefaults()` does for us. Otherwise, Talos enters a loop trying to reconfigure the bond in a loop. Prove with a unit-test (it fails if `.FillDefaults()` is removed). Fixes #12561 Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com> (cherry picked from commit 99f2dda)
diff --git a/internal/app/machined/pkg/controllers/network/link_spec_test.go b/internal/app/machined/pkg/controllers/network/link_spec_test.go
@@ -461,6 +461,55 @@ func (suite *LinkSpecSuite) TestBond() {
 	ctest.AssertNoResource[*network.LinkStatus](suite, bondName)
 }
 
+func (suite *LinkSpecSuite) TestBondActiveBackup() {
+	bondName := suite.uniqueDummyInterface()
+	bond := network.NewLinkSpec(network.NamespaceName, bondName)
+	*bond.TypedSpec() = network.LinkSpecSpec{
+		Name:    bondName,
+		Type:    nethelpers.LinkEther,
+		Kind:    network.LinkKindBond,
+		Up:      true,
+		Logical: true,
+		BondMaster: network.BondMasterSpec{
+			Mode:            nethelpers.BondModeActiveBackup,
+			HashPolicy:      nethelpers.BondXmitPolicyLayer2,
+			LACPRate:        nethelpers.LACPRateSlow,
+			ARPValidate:     nethelpers.ARPValidateNone,
+			ARPAllTargets:   nethelpers.ARPAllTargetsAny,
+			PrimaryReselect: nethelpers.PrimaryReselectAlways,
+			FailOverMac:     nethelpers.FailOverMACNone,
+		},
+		ConfigLayer: network.ConfigDefault,
+	}
+
+	networkadapter.BondMasterSpec(&bond.TypedSpec().BondMaster).FillDefaults()
+
+	for idx := range 2 {
+		dummyName := suite.uniqueDummyInterface()
+		dummy := network.NewLinkSpec(network.NamespaceName, dummyName)
+		*dummy.TypedSpec() = network.LinkSpecSpec{
+			Name:    dummyName,
+			Type:    nethelpers.LinkEther,
+			Kind:    "dummy",
+			Up:      true,
+			Logical: true,
+			BondSlave: network.BondSlave{
+				MasterName: bondName,
+				SlaveIndex: idx,
+			},
+			ConfigLayer: network.ConfigDefault,
+		}
+		suite.Create(dummy)
+	}
+
+	suite.Create(bond)
+
+	ctest.AssertResource(suite, bondName, func(r *network.LinkStatus, asrt *assert.Assertions) {
+		asrt.Equal(network.LinkKindBond, r.TypedSpec().Kind)
+		asrt.Contains([]nethelpers.OperationalState{nethelpers.OperStateUp, nethelpers.OperStateUnknown}, r.TypedSpec().OperationalState)
+	})
+}
+
 //nolint:gocyclo
 func (suite *LinkSpecSuite) TestBond8023ad() {
 	bondName := suite.uniqueDummyInterface()
diff --git a/internal/app/machined/pkg/controllers/network/platform_config_apply.go b/internal/app/machined/pkg/controllers/network/platform_config_apply.go
@@ -14,6 +14,7 @@ import (
 	"github.com/cosi-project/runtime/pkg/safe"
 	"go.uber.org/zap"
 
+	networkadapter "github.com/siderolabs/talos/internal/app/machined/pkg/adapters/network"
 	v1alpha1runtime "github.com/siderolabs/talos/internal/app/machined/pkg/runtime"
 	"github.com/siderolabs/talos/pkg/machinery/nethelpers"
 	"github.com/siderolabs/talos/pkg/machinery/resources/network"
@@ -201,6 +202,10 @@ func (ctrl *PlatformConfigApplyController) apply(ctx context.Context, r controll
 					*spec = newSpec.(network.LinkSpecSpec) //nolint:forcetypeassert
 					spec.ConfigLayer = network.ConfigPlatform
 
+					if spec.Kind == network.LinkKindBond {
+						networkadapter.BondMasterSpec(&spec.BondMaster).FillDefaults()
+					}
+
 					return nil
 				}
 			},
