Merge pull request #15 from squeed/lo-no-teardown

Bug 1754638: loopback: don't tear down
openshift · Sep 23, 2019 · b5e1059 · b5e1059
2 parents 446a8c7 + bb4969b
commit b5e1059
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 21 deletions.
diff --git a/plugins/main/loopback/loopback.go b/plugins/main/loopback/loopback.go
@@ -49,27 +49,6 @@ func cmdAdd(args *skel.CmdArgs) error {
 }
 
 func cmdDel(args *skel.CmdArgs) error {
-	if args.Netns == "" {
-		return nil
-	}
-	args.IfName = "lo" // ignore config, this only works for loopback
-	err := ns.WithNetNSPath(args.Netns, func(ns.NetNS) error {
-		link, err := netlink.LinkByName(args.IfName)
-		if err != nil {
-			return err // not tested
-		}
-
-		err = netlink.LinkSetDown(link)
-		if err != nil {
-			return err // not tested
-		}
-
-		return nil
-	})
-	if err != nil {
-		return err // not tested
-	}
-
 	return nil
 }
 

diff --git a/plugins/main/loopback/loopback_test.go b/plugins/main/loopback/loopback_test.go
@@ -82,6 +82,7 @@ var _ = Describe("Loopback", func() {
 		It("sets the lo device to DOWN", func() {
 
 			Skip("TODO: add network name")
+			Skip("We don't want to tear loopback down")
 			command.Env = append(environ, fmt.Sprintf("CNI_COMMAND=%s", "DEL"))
 
 			session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter)