chore: disable systeminfo controller in container

Disable systeminfo controller in container mode Fixes: #5849 Signed-off-by: Noel Georgi <[email protected]>
siderolabs · Jul 1, 2022 · 184e113 · 184e113
1 parent 86a0a7b
commit 184e113
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/internal/app/machined/pkg/controllers/hardware/system.go b/internal/app/machined/pkg/controllers/hardware/system.go
@@ -15,13 +15,15 @@ import (
 	"go.uber.org/zap"
 
 	hwadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/hardware"
+	runtimetalos "github.com/talos-systems/talos/internal/app/machined/pkg/runtime"
 	pkgSMBIOS "github.com/talos-systems/talos/internal/pkg/smbios"
 	"github.com/talos-systems/talos/pkg/machinery/resources/hardware"
 )
 
 // SystemInfoController populates CPU information of the underlying hardware.
 type SystemInfoController struct {
-	SMBIOS *smbios.SMBIOS
+	V1Alpha1Mode runtimetalos.Mode
+	SMBIOS       *smbios.SMBIOS
 }
 
 // Name implements controller.Controller interface.
@@ -62,6 +64,10 @@ func (ctrl *SystemInfoController) Run(ctx context.Context, r controller.Runtime,
 	case <-r.EventCh():
 	}
 
+	// smbios info is not available inside container, so skip the controller
+	if ctrl.V1Alpha1Mode == runtimetalos.ModeContainer {
+		return nil
+	}
 	// controller runs only once
 	if ctrl.SMBIOS == nil {
 		s, err := pkgSMBIOS.GetSMBIOSInfo()

diff --git a/internal/app/machined/pkg/controllers/hardware/system_test.go b/internal/app/machined/pkg/controllers/hardware/system_test.go
@@ -16,6 +16,7 @@ import (
 	"github.com/talos-systems/go-smbios/smbios"
 
 	hardwarectrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/hardware"
+	runtimetalos "github.com/talos-systems/talos/internal/app/machined/pkg/runtime"
 	"github.com/talos-systems/talos/pkg/machinery/resources/hardware"
 )
 
@@ -124,6 +125,20 @@ func (suite *SystemInfoSuite) TestPopulateSystemInformation() {
 	}
 }
 
+func (suite *SystemInfoSuite) TestPopulateSystemInformationIsDisabledInContainerMode() {
+	suite.Require().NoError(
+		suite.runtime.RegisterController(
+			&hardwarectrl.SystemInfoController{
+				V1Alpha1Mode: runtimetalos.ModeContainer,
+			},
+		),
+	)
+
+	suite.startRuntime()
+
+	suite.Assert().NoError(retry.Constant(1*time.Second, retry.WithUnits(100*time.Millisecond)).Retry(suite.assertNoResource(*hardware.NewSystemInformation("systeminformation").Metadata())))
+}
+
 func TestSystemInfoSyncSuite(t *testing.T) {
 	suite.Run(t, new(SystemInfoSuite))
 }

diff --git a/internal/app/machined/pkg/runtime/v1alpha2/v1alpha2_controller.go b/internal/app/machined/pkg/runtime/v1alpha2/v1alpha2_controller.go
@@ -109,7 +109,9 @@ func (ctrl *Controller) Run(ctx context.Context, drainer *runtime.Drainer) error
 			EtcPath:    "/etc",
 			ShadowPath: constants.SystemEtcPath,
 		},
-		&hardware.SystemInfoController{},
+		&hardware.SystemInfoController{
+			V1Alpha1Mode: ctrl.v1alpha1Runtime.State().Platform().Mode(),
+		},
 		&k8s.ControlPlaneStaticPodController{},
 		&k8s.EndpointController{},
 		&k8s.ExtraManifestController{},