Fix linter

Author: mazdakn

felix/fv/infrastructure/felix.go

@@ -30,7 +30,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	api "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 
 	"github.com/projectcalico/calico/felix/bpf/jump"
 	"github.com/projectcalico/calico/felix/bpf/polprog"
@@ -98,34 +98,34 @@ type workload interface {
 
 func (f *Felix) GetFelixPID() int {
 	if f.startupDelayed {
-		log.Panic("GetFelixPID() called but startup is delayed")
+		logrus.Panic("GetFelixPID() called but startup is delayed")
 	}
 	if f.restartDelayed {
-		log.Panic("GetFelixPID() called but restart is delayed")
+		logrus.Panic("GetFelixPID() called but restart is delayed")
 	}
 	return f.GetSinglePID("calico-felix")
 }
 
 func (f *Felix) GetFelixPIDs() []int {
 	if f.startupDelayed {
-		log.Panic("GetFelixPIDs() called but startup is delayed")
+		logrus.Panic("GetFelixPIDs() called but startup is delayed")
 	}
 	if f.restartDelayed {
-		log.Panic("GetFelixPIDs() called but restart is delayed")
+		logrus.Panic("GetFelixPIDs() called but restart is delayed")
 	}
 	return f.GetPIDs("calico-felix")
 }
 
 func (f *Felix) TriggerDelayedStart() {
 	if !f.startupDelayed {
-		log.Panic("TriggerDelayedStart() called but startup wasn't delayed")
+		logrus.Panic("TriggerDelayedStart() called but startup wasn't delayed")
 	}
 	f.Exec("touch", "/start-trigger")
 	f.startupDelayed = false
 }
 
 func RunFelix(infra DatastoreInfra, id int, options TopologyOptions) *Felix {
-	log.Info("Starting felix")
+	logrus.Info("Starting felix")
 	ipv6Enabled := fmt.Sprint(options.EnableIPv6)
 	bpfEnableIPv6 := fmt.Sprint(options.BPFEnableIPv6)
 
@@ -181,10 +181,10 @@ func RunFelix(infra DatastoreInfra, id int, options TopologyOptions) *Felix {
 
 	if os.Getenv("FELIX_FV_ENABLE_BPF") == "true" {
 		if !options.TestManagesBPF {
-			log.Info("FELIX_FV_ENABLE_BPF=true, enabling BPF with env var")
+			logrus.Info("FELIX_FV_ENABLE_BPF=true, enabling BPF with env var")
 			envVars["FELIX_BPFENABLED"] = "true"
 		} else {
-			log.Info("FELIX_FV_ENABLE_BPF=true but test manages BPF state itself, not using env var")
+			logrus.Info("FELIX_FV_ENABLE_BPF=true but test manages BPF state itself, not using env var")
 		}
 
 		if CreateCgroupV2 {
@@ -209,11 +209,14 @@ func RunFelix(infra DatastoreInfra, id int, options TopologyOptions) *Felix {
 	if options.FlowLogSource == FlowLogSourceGoldmane {
 		sockAddr := fmt.Sprintf("%v/goldmane.sock", logDir)
 		goldmaneServer = goldmane.NewNodeServer(sockAddr)
-		goldmaneServer.Run()
+		err := goldmaneServer.Run()
+		if err != nil {
+			logrus.WithError(err).Panic("Failed to start goldmane node server")
+		}
 	}
 
 	if os.Getenv("FELIX_FV_NFTABLES") == "Enabled" {
-		log.Info("Enabling nftables with env var")
+		logrus.Info("Enabling nftables with env var")
 		envVars["FELIX_NFTABLESMODE"] = "Enabled"
 	}
 
@@ -328,7 +331,7 @@ func (f *Felix) Restart() {
 
 func (f *Felix) RestartWithDelayedStartup() func() {
 	if f.restartDelayed {
-		log.Panic("RestartWithDelayedStartup() called but restart was delayed already")
+		logrus.Panic("RestartWithDelayedStartup() called but restart was delayed already")
 	}
 	oldPID := f.GetFelixPID()
 	f.restartDelayed = true
@@ -341,7 +344,7 @@ func (f *Felix) RestartWithDelayedStartup() func() {
 		defer GinkgoRecover()
 		select {
 		case <-time.After(time.Second * 30):
-			log.Panic("Restart with delayed startup timed out after 30s")
+			logrus.Panic("Restart with delayed startup timed out after 30s")
 		case <-triggerChan:
 			return
 		}