Merge pull request #1038 from s1061123/fix-netnsoverride

Fix if condition for netns override
containernetworking · Nov 20, 2023 · 93878e6 · 93878e6
2 parents cf9ca9e + 26cfdbe
commit 93878e6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/skel/skel.go b/pkg/skel/skel.go
@@ -245,7 +245,7 @@ func (t *dispatcher) pluginMain(funcs CNIFuncs, versionInfo version.PluginInfo,
 		if err != nil {
 			return err
 		}
-		if strings.ToUpper(cmdArgs.NetnsOverride) != "TRUE" || cmdArgs.NetnsOverride != "1" {
+		if strings.ToUpper(cmdArgs.NetnsOverride) != "TRUE" && cmdArgs.NetnsOverride != "1" {
 			isPluginNetNS, checkErr := ns.CheckNetNS(cmdArgs.Netns)
 			if checkErr != nil {
 				return checkErr
@@ -280,7 +280,7 @@ func (t *dispatcher) pluginMain(funcs CNIFuncs, versionInfo version.PluginInfo,
 		if err != nil {
 			return err
 		}
-		if strings.ToUpper(cmdArgs.NetnsOverride) != "TRUE" || cmdArgs.NetnsOverride != "1" {
+		if strings.ToUpper(cmdArgs.NetnsOverride) != "TRUE" && cmdArgs.NetnsOverride != "1" {
 			isPluginNetNS, checkErr := ns.CheckNetNS(cmdArgs.Netns)
 			if checkErr != nil {
 				return checkErr