Fix default network not being set when priority changes

If the priorities (sorted by name) of the configured networks change, then the default network needs to be adapted to ensure it is actually being used. Signed-off-by: Sascha Grunert <[email protected]>
cri-o · Jun 13, 2019 · db4d13e · db4d13e
1 parent a4c8e18
commit db4d13e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/pkg/ocicni/ocicni.go b/pkg/ocicni/ocicni.go
@@ -334,11 +334,9 @@ func (plugin *cniNetworkPlugin) syncNetworkConfig() error {
 	}
 
 	plugin.Lock()
-	defer plugin.Unlock()
-	if plugin.defaultNetName == "" {
-		plugin.defaultNetName = defaultNetName
-	}
+	plugin.defaultNetName = defaultNetName
 	plugin.networks = networks
+	plugin.Unlock()
 
 	return nil
 }

diff --git a/pkg/ocicni/ocicni_test.go b/pkg/ocicni/ocicni_test.go
@@ -190,7 +190,7 @@ var _ = Describe("ocicni operations", func() {
 		// Writing a config that doesn't match the default network
 		_, _, err = writeConfig(tmpDir, "5-notdefault.conf", "notdefault", "myplugin")
 		Expect(err).NotTo(HaveOccurred())
-		Consistently(ocicni.Status, 5).Should(HaveOccurred())
+		Eventually(ocicni.Status, 5).Should(HaveOccurred())
 
 		_, _, err = writeConfig(tmpDir, "10-test.conf", "test", "myplugin")
 		Expect(err).NotTo(HaveOccurred())