fix: propagate route table down to the resource

Fixes #13153

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
(cherry picked from commit 3399ff4)

Author: smira

internal/app/machined/pkg/controllers/network/route_config.go

@@ -328,7 +328,7 @@ func (ctrl *RouteConfigController) processMachineConfig(linkConfigs []cfg.Networ
 				route.Family = nethelpers.FamilyInet4
 			}
 
-			route.Table = nethelpers.TableMain
+			route.Table = spec.Table().ValueOr(nethelpers.TableMain)
 			route.Protocol = nethelpers.ProtocolStatic
 			route.OutLinkName = linkConfig.Name()
 			route.ConfigLayer = network.ConfigMachineConfiguration

internal/app/machined/pkg/controllers/network/route_config_test.go

@@ -245,6 +245,7 @@ func (suite *RouteConfigSuite) TestMachineConfiguration() {
 		{
 			RouteGateway: networkcfg.Addr{Addr: netip.MustParseAddr("2001:470:6d:30e:8ed2:b60c:9d2f:803b")},
 			RouteMetric:  200,
+			RouteTable:   nethelpers.Table101,
 		},
 	}
 
@@ -259,25 +260,28 @@ func (suite *RouteConfigSuite) TestMachineConfiguration() {
 	ctest.AssertResources(
 		suite,
 		[]string{
-			"configuration/enp0s3/inet6/2001:470:6d:30e:8ed2:b60c:9d2f:803b//200",
+			"configuration/101/enp0s3/inet6/2001:470:6d:30e:8ed2:b60c:9d2f:803b//200",
 			"configuration/inet4/10.12.3.1/10.12.3.0/24/1024",
 			"configuration/inet4//10.1.3.4/32/300",
 		},
 		func(r *network.RouteSpec, asrt *assert.Assertions) {
 			switch r.Metadata().ID() {
-			case "configuration/enp0s3/inet6/2001:470:6d:30e:8ed2:b60c:9d2f:803b//200":
+			case "configuration/101/enp0s3/inet6/2001:470:6d:30e:8ed2:b60c:9d2f:803b//200":
 				asrt.Equal("enp0s3", r.TypedSpec().OutLinkName)
 				asrt.Equal(nethelpers.FamilyInet6, r.TypedSpec().Family)
 				asrt.EqualValues(200, r.TypedSpec().Priority)
+				asrt.EqualValues(nethelpers.Table101, r.TypedSpec().Table)
 			case "configuration/inet4/10.12.3.1/10.12.3.0/24/1024":
 				asrt.Equal("enp0s2", r.TypedSpec().OutLinkName)
 				asrt.Equal(nethelpers.FamilyInet4, r.TypedSpec().Family)
 				asrt.EqualValues(network.DefaultRouteMetric, r.TypedSpec().Priority)
+				asrt.EqualValues(nethelpers.TableMain, r.TypedSpec().Table)
 			case "configuration/inet4//10.1.3.4/32/300":
 				asrt.Empty(r.TypedSpec().OutLinkName)
 				asrt.Equal(nethelpers.FamilyInet4, r.TypedSpec().Family)
 				asrt.EqualValues(300, r.TypedSpec().Priority)
 				asrt.Equal(nethelpers.TypeBlackhole, r.TypedSpec().Type)
+				asrt.EqualValues(nethelpers.TableMain, r.TypedSpec().Table)
 			}
 
 			asrt.Equal(network.ConfigMachineConfiguration, r.TypedSpec().ConfigLayer)

internal/integration/api/network-config.go

@@ -147,11 +147,12 @@ func (suite *NetworkConfigSuite) TestDummyLinkConfig() {
 		{
 			RouteDestination: network.Prefix{Prefix: netip.MustParsePrefix("fd13:1235::/64")},
 			RouteGateway:     network.Addr{Addr: netip.MustParseAddr("fd13:1234::ffff")},
+			RouteTable:       nethelpers.Table101,
 		},
 	}
 
 	addressID := dummyName + "/fd13:1234::1/64"
-	routeID := dummyName + "/inet6/fd13:1234::ffff/fd13:1235::/64/1024"
+	routeID := "101/" + dummyName + "/inet6/fd13:1234::ffff/fd13:1235::/64/1024"
 	addressRouteID := dummyName + "/inet6//fd13:1234::/64/100"
 
 	suite.PatchMachineConfig(nodeCtx, dummy)
@@ -174,6 +175,12 @@ func (suite *NetworkConfigSuite) TestDummyLinkConfig() {
 		[]resource.ID{routeID, addressRouteID},
 		func(route *networkres.RouteStatus, asrt *assert.Assertions) {
 			asrt.Equal(dummyName, route.TypedSpec().OutLinkName)
+
+			if route.Metadata().ID() == routeID {
+				asrt.Equal(nethelpers.Table101, route.TypedSpec().Table)
+			} else {
+				asrt.Equal(nethelpers.TableMain, route.TypedSpec().Table)
+			}
 		},
 	)