NO-ISSUE: agent: ensure os image exists in status

Signed-off-by: Sam Batschelet <[email protected]>
lkatalin · Jul 1, 2024 · e8e7719 · e8e7719
1 parent 475775d
commit e8e7719
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/internal/agent/device/bootstrap.go b/internal/agent/device/bootstrap.go
@@ -31,6 +31,7 @@ type Bootstrap struct {
  enrollmentClient *client.Enrollment
  enrollmentUIEndpoint string
  statusManager status.Manager
+ bootcClient *container.BootcCmd
  backoff wait.Backoff
 
  currentRenderedFile string
@@ -68,6 +69,7 @@ func NewBootstrap(
  enrollmentClient: enrollmentClient,
  enrollmentUIEndpoint: enrollmentUIEndpoint,
  managementServiceConfig: managementServiceConfig,
+ bootcClient: container.NewBootcCmd(executer),
  backoff: backoff,
  currentRenderedFile: currentRenderedFile,
  desiredRenderedFile: desiredRenderedFile,
@@ -143,8 +145,7 @@ func (b *Bootstrap) ensureCurrentRenderedSpecUpToDate(ctx context.Context) error
  return nil
  }
 
- bootcCmd := container.NewBootcCmd(b.executer)
- bootcHost, err := bootcCmd.Status(ctx)
+ bootcHost, err := b.bootcClient.Status(ctx)
  if err != nil {
  return fmt.Errorf("getting current bootc status: %w", err)
  }

diff --git a/internal/agent/device/status/status.go b/internal/agent/device/status/status.go
@@ -23,7 +23,7 @@ func NewManager(
  exporters := []Exporter{
  newSystemD(executer),
  newContainer(executer),
- newSystemInfo(),
+ newSystemInfo(executer),
  newResources(log, resourceManager),
  }
  status := v1alpha1.NewDeviceStatus()

diff --git a/internal/agent/device/status/systeminfo.go b/internal/agent/device/status/systeminfo.go
@@ -6,6 +6,8 @@ import (
  "runtime"
 
  "github.com/flightctl/flightctl/api/v1alpha1"
+ "github.com/flightctl/flightctl/internal/container"
+ "github.com/flightctl/flightctl/pkg/executer"
  "github.com/google/cadvisor/fs"
  "github.com/google/cadvisor/machine"
  "github.com/google/cadvisor/utils/sysfs"
@@ -15,12 +17,14 @@ var _ Exporter = (*SystemInfo)(nil)
 
 // SystemInfo collects system information.
 type SystemInfo struct {
- sysFs sysfs.SysFs
+ sysFs sysfs.SysFs
+ bootcClient *container.BootcCmd
 }
 
-func newSystemInfo() *SystemInfo {
+func newSystemInfo(exec executer.Executer) *SystemInfo {
  return &SystemInfo{
- sysFs: sysfs.NewRealSysFs(),
+ sysFs: sysfs.NewRealSysFs(),
+ bootcClient: container.NewBootcCmd(exec),
  }
 }
 
@@ -45,6 +49,18 @@ func (s *SystemInfo) Export(ctx context.Context, status *v1alpha1.DeviceStatus)
  BootID: info.BootID,
  }
 
+ bootcInfo, err := s.bootcClient.Status(ctx)
+ if err != nil {
+ return fmt.Errorf("getting bootc status: %w", err)
+ }
+
+ osImage := container.GetImage(bootcInfo)
+ if osImage == "" {
+ return fmt.Errorf("getting os image: %w", err)
+ }
+
+ status.Os.Image = osImage
+
  return nil
 }