fix: provide minimal platform metadata always

Fixes #12097

Reverts "fix: provide nocloud metadata with missing network config"

This reverts commit 435dcbf.

The reverted commit fixes #12097, while minimal platform metadata
fixes issue
siderolabs/omni#1633 (reply in thread).

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>

Author: smira

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"
 
+	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"
 	runtimeres "github.com/siderolabs/talos/pkg/machinery/resources/runtime"
@@ -23,7 +24,9 @@ import (
 const externalLink = "external"
 
 // PlatformConfigApplyController applies active (or cached) platform network config to the network stack.
-type PlatformConfigApplyController struct{}
+type PlatformConfigApplyController struct {
+	V1alpha1Platform v1alpha1runtime.Platform
+}
 
 // Name implements controller.Controller interface.
 func (ctrl *PlatformConfigApplyController) Name() string {
@@ -117,9 +120,13 @@ func (ctrl *PlatformConfigApplyController) Run(ctx context.Context, r controller
 			}
 		}
 
-		// if we don't have any config yet, wait...
+		// if we don't have any config yet, populate a minimal one
+		// to ensure that platform name is populated in the resource
 		if platformConfig == nil {
-			continue
+			platformConfig = network.NewPlatformConfig(network.NamespaceName, network.PlatformConfigActiveID)
+			platformConfig.TypedSpec().Metadata = &runtimeres.PlatformMetadataSpec{
+				Platform: ctrl.V1alpha1Platform.Name(),
+			}
 		}
 
 		if err := ctrl.apply(ctx, r, platformConfig); err != nil {

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

@@ -17,6 +17,7 @@ import (
 
 	"github.com/siderolabs/talos/internal/app/machined/pkg/controllers/ctest"
 	netctrl "github.com/siderolabs/talos/internal/app/machined/pkg/controllers/network"
+	"github.com/siderolabs/talos/internal/app/machined/pkg/runtime/v1alpha1/platform/metal"
 	"github.com/siderolabs/talos/pkg/machinery/nethelpers"
 	"github.com/siderolabs/talos/pkg/machinery/resources/network"
 	runtimeres "github.com/siderolabs/talos/pkg/machinery/resources/runtime"
@@ -297,6 +298,13 @@ func (suite *PlatformConfigApplySuite) TestMetadata() {
 		})
 }
 
+func (suite *PlatformConfigApplySuite) TestNoPlatformConfig() {
+	ctest.AssertResource(suite, runtimeres.PlatformMetadataID,
+		func(r *runtimeres.PlatformMetadata, asrt *assert.Assertions) {
+			asrt.Equal("metal", r.TypedSpec().Platform)
+		})
+}
+
 func TestPlatformConfigApplySuite(t *testing.T) {
 	t.Parallel()
 
@@ -306,7 +314,9 @@ func TestPlatformConfigApplySuite(t *testing.T) {
 			AfterSetup: func(suite *ctest.DefaultSuite) {
 				suite.Require().NoError(
 					suite.Runtime().RegisterController(
-						&netctrl.PlatformConfigApplyController{},
+						&netctrl.PlatformConfigApplyController{
+							V1alpha1Platform: &metal.Metal{},
+						},
 					))
 			},
 		},

internal/app/machined/pkg/runtime/v1alpha1/platform/nocloud/nocloud.go

@@ -61,19 +61,17 @@ func (n *Nocloud) ParseMetadata(ctx context.Context, unmarshalledNetworkConfig *
 		err            error
 	)
 
-	if unmarshalledNetworkConfig != nil {
-		switch unmarshalledNetworkConfig.Version {
-		case 1:
-			if needsReconcile, err = n.applyNetworkConfigV1(ctx, unmarshalledNetworkConfig, st, networkConfig); err != nil {
-				return nil, false, err
-			}
-		case 2:
-			if needsReconcile, err = n.applyNetworkConfigV2(ctx, unmarshalledNetworkConfig, st, networkConfig); err != nil {
-				return nil, false, err
-			}
-		default:
-			return nil, false, fmt.Errorf("network-config metadata version=%d is not supported", unmarshalledNetworkConfig.Version)
+	switch unmarshalledNetworkConfig.Version {
+	case 1:
+		if needsReconcile, err = n.applyNetworkConfigV1(ctx, unmarshalledNetworkConfig, st, networkConfig); err != nil {
+			return nil, false, err
+		}
+	case 2:
+		if needsReconcile, err = n.applyNetworkConfigV2(ctx, unmarshalledNetworkConfig, st, networkConfig); err != nil {
+			return nil, false, err
 		}
+	default:
+		return nil, false, fmt.Errorf("network-config metadata version=%d is not supported", unmarshalledNetworkConfig.Version)
 	}
 
 	networkConfig.Metadata = &runtimeres.PlatformMetadataSpec{
@@ -143,13 +141,14 @@ func (n *Nocloud) NetworkConfiguration(ctx context.Context, st state.State, ch c
 		return err
 	}
 
-	var unmarshalledNetworkConfig *NetworkConfig
+	if metadataNetworkConfigDl == nil {
+		// no data, use cached network configuration if available
+		return nil
+	}
 
-	if metadataNetworkConfigDl != nil {
-		unmarshalledNetworkConfig, err = DecodeNetworkConfig(metadataNetworkConfigDl)
-		if err != nil {
-			return err
-		}
+	unmarshalledNetworkConfig, err := DecodeNetworkConfig(metadataNetworkConfigDl)
+	if err != nil {
+		return err
 	}
 
 	// do a loop to retry network config remap in case of missing links

internal/app/machined/pkg/runtime/v1alpha1/platform/nocloud/nocloud_test.go

@@ -243,23 +243,3 @@ https://metadataserver3/userdata
 		})
 	}
 }
-
-func TestEmptyNetworkConfig(t *testing.T) {
-	t.Parallel()
-
-	n := &nocloud.Nocloud{}
-
-	st := state.WrapCore(namespaced.NewState(inmem.Build))
-
-	var md nocloud.MetadataConfig
-
-	networkConfig, needsReconcile, err := n.ParseMetadata(t.Context(), nil, st, &md)
-	require.NoError(t, err)
-	assert.False(t, needsReconcile)
-
-	assert.Equal(t, &network.PlatformConfigSpec{
-		Metadata: &runtime.PlatformMetadataSpec{
-			Platform: "nocloud",
-		},
-	}, networkConfig)
-}

internal/app/machined/pkg/runtime/v1alpha2/v1alpha2_controller.go

@@ -346,7 +346,9 @@ func (ctrl *Controller) Run(ctx context.Context, drainer *runtime.Drainer) error
 		&network.OperatorVIPConfigController{
 			Cmdline: procfs.ProcCmdline(),
 		},
-		&network.PlatformConfigApplyController{},
+		&network.PlatformConfigApplyController{
+			V1alpha1Platform: ctrl.v1alpha1Runtime.State().Platform(),
+		},
 		&network.PlatformConfigController{
 			V1alpha1Platform: ctrl.v1alpha1Runtime.State().Platform(),
 			PlatformState:    ctrl.v1alpha1Runtime.State().V1Alpha2().Resources(),