Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Expect(err).NotTo(HaveOccurred())
defer os.RemoveAll(tmpDir)
+ err = ioutil.WriteFile(filepath.Join(tmpDir, "resolv.conf"), []byte("nameserver 192.0.2.3"), 0644)
+ Expect(err).NotTo(HaveOccurred())
+
conf := fmt.Sprintf(`{
"cniVersion": "0.1.0",
"name": "mynet",
"ipam": {
"type": "host-local",
"subnet": "10.1.2.0/24",
- "dataDir": "%s"
+ "dataDir": "%s",
+ "resolvConf": "%s/resolv.conf"
}
-}`, tmpDir)
+}`, tmpDir, tmpDir)
args := &skel.CmdArgs{
ContainerID: "dummy",
defer os.RemoveAll(tmpDir)
conf := fmt.Sprintf(`{
- "cniVersion": "0.2.0",
+ "cniVersion": "0.3.0",
"name": "mynet",
"type": "ipvlan",
"master": "foo0",