config: Move check code to end of LoadConfiguration

Move the VSOCK handling code higher up so that all the checking code is gathered together at the end of `LoadConfiguration()`. Signed-off-by: James O. D. Hunt <[email protected]>
kata-containers · Nov 29, 2018 · 70e4dc5 · 70e4dc5
1 parent e06c8aa
commit 70e4dc5
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/pkg/katautils/config.go b/pkg/katautils/config.go
@@ -651,18 +651,18 @@ func LoadConfiguration(configPath string, ignoreLogging, builtIn bool) (resolved
 		return "", config, err
 	}
 
-	config.DisableNewNetNs = tomlConf.Runtime.DisableNewNetNs
-	if err := checkNetNsConfig(config); err != nil {
-		return "", config, err
-	}
-
 	// use no proxy if HypervisorConfig.UseVSock is true
 	if config.HypervisorConfig.UseVSock {
 		kataUtilsLogger.Info("VSOCK supported, configure to not use proxy")
 		config.ProxyType = vc.NoProxyType
 		config.ProxyConfig = vc.ProxyConfig{}
 	}
 
+	config.DisableNewNetNs = tomlConf.Runtime.DisableNewNetNs
+	if err := checkNetNsConfig(config); err != nil {
+		return "", config, err
+	}
+
 	if err := checkHypervisorConfig(config.HypervisorConfig); err != nil {
 		return "", config, err
 	}