Use envconfig for all SUBMARINER_ variables

In the Lighthouse agent, logging settings are specified using SUBMARINER_ variables but parsed manually. Since envconfig is used for all other SUBMARINER_ variables, extend it to cover these settings as well. Signed-off-by: Stephen Kitt <[email protected]>
submariner-io · Oct 26, 2023 · 9ab2846 · 9ab2846
1 parent cf0e7f8
commit 9ab2846
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/pkg/agent/controller/types.go b/pkg/agent/controller/types.go
@@ -60,9 +60,11 @@ type Controller struct {
 type AgentSpecification struct {
 	ClusterID        string
 	Namespace        string
+	Verbosity        int
 	GlobalnetEnabled bool `split_words:"true"`
 	Uninstall        bool
 	HaltOnCertError  bool `split_words:"true"`
+	Debug            bool
 }
 
 type ServiceImportAggregator struct {

diff --git a/pkg/agent/main.go b/pkg/agent/main.go
@@ -69,17 +69,19 @@ func exitOnError(err error, reason string) {
 }
 
 func main() {
-	// Handle environment variables:
-	// SUBMARINER_VERBOSITY determines the verbosity level (1 by default)
-	// SUBMARINER_DEBUG, if set to true, sets the verbosity level to 3
-	if debug := os.Getenv("SUBMARINER_DEBUG"); debug == "true" {
-		os.Args = append(os.Args, fmt.Sprintf("-v=%d", log.LIBDEBUG))
-	} else if verbosity := os.Getenv("SUBMARINER_VERBOSITY"); verbosity != "" {
-		os.Args = append(os.Args, fmt.Sprintf("-v=%s", verbosity))
-	} else {
-		os.Args = append(os.Args, fmt.Sprintf("-v=%d", log.DEBUG))
+	agentSpec := controller.AgentSpecification{
+		Verbosity: log.DEBUG,
+	}
+	err := envconfig.Process("submariner", &agentSpec)
+	exitOnError(err, "Error processing env config for agent spec")
+
+	if agentSpec.Debug {
+		agentSpec.Verbosity = log.LIBDEBUG
 	}
 
+	// Set up verbosity based on environment variables
+	os.Args = append(os.Args, fmt.Sprintf("-v=%d", agentSpec.Verbosity))
+
 	kzerolog.AddFlags(nil)
 	flag.Parse()
 
@@ -104,10 +106,6 @@ func main() {
 	klogFlags.Parse(os.Args[1:])
 
 	logger.Infof("Arguments: %v", os.Args)
-
-	agentSpec := controller.AgentSpecification{}
-	err := envconfig.Process("submariner", &agentSpec)
-	exitOnError(err, "Error processing env config for agent spec")
 	logger.Infof("AgentSpec: %#v", agentSpec)
 
 	util.AddCertificateErrorHandler(agentSpec.HaltOnCertError)