daemon/cni: correctly handle empty chaining mode

There was a logic error when handling an unset chaining mode. Signed-off-by: Casey Callendrello <cdc@isovalent.com>
cilium · May 3, 2023 · 0f75ecd · 0f75ecd
1 parent 73cf477
commit 0f75ecd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/daemon/cmd/cni/cell.go b/daemon/cmd/cni/cell.go
@@ -72,6 +72,10 @@ func newConfigManager(log logrus.FieldLogger, cfg Config, debug bool) *cniConfig
 		cfg.CNIChainingMode = "generic-veth"
 	}
 
+	if cfg.CNIChainingMode == "" {
+		cfg.CNIChainingMode = "none"
+	}
+
 	c := &cniConfigManager{
 		config:     cfg,
 		debug:      debug,

diff --git a/daemon/cmd/cni/config.go b/daemon/cmd/cni/config.go
@@ -290,11 +290,7 @@ func (c *cniConfigManager) renderCNIConf() (cniConfig []byte, err error) {
 			return nil, err
 		}
 	} else {
-		mode := c.config.CNIChainingMode
-		if mode == "" {
-			mode = "none"
-		}
-		c.log.Infof("Generating CNI configuration file with mode %s", mode)
+		c.log.Infof("Generating CNI configuration file with mode %s", c.config.CNIChainingMode)
 		tmpl := cniConfigs[c.config.CNIChainingMode]
 		cniConfig = []byte(c.renderCNITemplate(tmpl))
 	}