feat(standalone): Add errors on missing crictl on machine

Author: BeegiiK

cmd/standalone/daemon.go

@@ -62,7 +62,7 @@ func (d *Daemon) Start() error {
 	}
 	go controller.Run(ctx)
 
-	// Standalone requires pod level to be disabled
+	// Initialize controller manager
 	controllerMgr, err := cm.NewStandaloneControllerManager(daemonCfg, tel)
 	if err != nil {
 		mainLogger.Fatal("Failed to create controller manager", zap.Error(err))

deploy/standard/manifests/controller/helm/retina/values.yaml

@@ -51,8 +51,6 @@ image:
   tag: "v0.0.2"
 
 enableConntrackMetrics: false
-enableStandalone: false
-EnableCrictl: false
 enablePodLevel: false
 remoteContext: false
 enableAnnotations: false

pkg/config/standalone_config.go

@@ -23,7 +23,7 @@ type StandaloneConfig struct {
 	MetricsInterval      time.Duration `yaml:"metricsInterval"`
 	TelemetryInterval    time.Duration `yaml:"telemetryInterval"`
 	EnrichmentMode       string        `yaml:"enrichmentMode"`
-	CriCtlCommandTimeout time.Duration `yaml:"crictlCommandTimeout"`
+	CrictlCommandTimeout time.Duration `yaml:"crictlCommandTimeout"`
 	StateFileLocation    string        `yaml:"stateFileLocation"`
 }
 
@@ -36,7 +36,7 @@ var (
 		MetricsInterval:      time.Second,
 		EnrichmentMode:       "crictl",
 		TelemetryInterval:    DefaultTelemetryInterval,
-		CriCtlCommandTimeout: 5 * time.Second,
+		CrictlCommandTimeout: 5 * time.Second,
 	}
 
 	ErrMissingStateFileLocation = errors.New("stateFileLocation must be set when using statefile enrichment mode")
@@ -80,9 +80,9 @@ func GetStandaloneConfig(cfgFilename string) (*StandaloneConfig, error) {
 		config.TelemetryInterval = DefaultTelemetryInterval
 	}
 
-	if config.CriCtlCommandTimeout == 0 {
-		log.Printf("crictlCommandTimeout is not set, defaulting to %v", DefaultStandaloneConfig.CriCtlCommandTimeout)
-		config.CriCtlCommandTimeout = DefaultStandaloneConfig.CriCtlCommandTimeout
+	if config.CrictlCommandTimeout == 0 {
+		log.Printf("crictlCommandTimeout is not set, defaulting to %v", DefaultStandaloneConfig.CrictlCommandTimeout)
+		config.CrictlCommandTimeout = DefaultStandaloneConfig.CrictlCommandTimeout
 	}
 
 	switch {

pkg/config/standalone_config_test.go

@@ -23,7 +23,7 @@ func TestGetStandaloneConfig(t *testing.T) {
 		c.MetricsInterval != 1*time.Second ||
 		c.TelemetryInterval != 15*time.Minute ||
 		c.EnrichmentMode != "azure-vnet-statefile" ||
-		c.CriCtlCommandTimeout != 5*time.Second ||
+		c.CrictlCommandTimeout != 5*time.Second ||
 		c.StateFileLocation != "/generic/file/location/azure-vnet.json" {
 		t.Errorf("Expeted config should be same as ./testwith/config-standalone.yaml; instead got %+v", c)
 	}

pkg/controllers/daemon/standalone/controller.go

@@ -39,7 +39,10 @@ func New(config *kcfg.StandaloneConfig, cache *standalone.Cache, metricsModule *
 
 	switch {
 	case config.EnrichmentMode == "crictl":
-		src = ctrinfo.New(config.CriCtlCommandTimeout)
+		src, err = ctrinfo.New(config.CrictlCommandTimeout)
+		if err != nil {
+			return nil, fmt.Errorf("failed to create crictl source: %w", err)
+		}
 
 	case strings.HasSuffix(config.EnrichmentMode, "statefile"):
 		src, err = statefile.New(config.EnrichmentMode, config.StateFileLocation)
@@ -103,7 +106,7 @@ func (c *Controller) Reconcile(ctx context.Context) error {
 func (c *Controller) Run(ctx context.Context) {
 	c.l.Info("Starting controller")
 
-	ticker := time.NewTicker(c.config.MetricsInterval / 2)
+	ticker := time.NewTicker(c.config.MetricsInterval)
 	defer ticker.Stop()
 
 	for {

pkg/controllers/daemon/standalone/source/ctrinfo/ctrinfo.go

@@ -48,12 +48,20 @@ var (
 	errJSONRead   = errors.New("error unmarshalling JSON")
 )
 
-func New(commandTimeout time.Duration) *Ctrinfo {
+func new(commandTimeout time.Duration) *Ctrinfo {
 	return &Ctrinfo{
 		commandTimeout: commandTimeout,
 	}
 }
 
+func New(commandTimeout time.Duration) (*Ctrinfo, error) {
+	_, err := exec.LookPath("crictl")
+	if err != nil {
+		return nil, fmt.Errorf("crictl not found in PATH: %w", err)
+	}
+	return new(commandTimeout), nil
+}
+
 func (c *Ctrinfo) GetAllEndpoints() ([]*common.RetinaEndpoint, error) {
 	// Using crictl to get all running pods
 	runningPods, err := getPodsCmd(c)

pkg/controllers/daemon/standalone/source/ctrinfo/ctrinfo_test.go

@@ -21,7 +21,7 @@ func TestCtrinfoGetAllEndpoints(t *testing.T) {
 	require.NoError(t, err, "failed to create invalid JSON file")
 	defer os.Remove(invalidJSONPath)
 
-	src := New(5 * time.Second)
+	src := new(1 * time.Second)
 
 	tests := []struct {
 		name                   string

pkg/controllers/daemon/standalone/source/statefile/statefile.go

@@ -4,6 +4,8 @@
 package statefile
 
 import (
+	"os"
+
 	"github.com/pkg/errors"
 
 	"github.com/microsoft/retina/pkg/controllers/daemon/standalone/source"
@@ -12,11 +14,19 @@ import (
 
 var ErrUnsupportedStatefileType = errors.New("unsupported statefile enrichment type, valid types are: azure-vnet-statefile")
 
-func New(enrichmentMode, location string) (source.Source, error) {
+func new(enrichmentMode, location string) (source.Source, error) {
 	switch enrichmentMode {
 	case "azure-vnet-statefile":
 		return azure.New(location), nil
 	default:
 		return nil, errors.Wrapf(ErrUnsupportedStatefileType, "enrichmentMode=%s", enrichmentMode)
 	}
 }
+
+func New(enrichmentMode, location string) (source.Source, error) {
+	if _, err := os.Stat(location); os.IsNotExist(err) {
+		return nil, errors.Wrapf(err, "statefile does not exist at location: %s", location)
+	}
+
+	return new(enrichmentMode, location)
+}

pkg/controllers/daemon/standalone/source/statefile/statefile_test.go

@@ -36,7 +36,7 @@ func TestNew(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			src, err := New(tt.enrichmentMode, tt.location)
+			src, err := new(tt.enrichmentMode, tt.location)
 
 			if tt.wantErr != nil {
 				require.ErrorContains(t, err, tt.wantErr.Error())