Merge pull request #660 from Junnplus/bridge-netif

remove bridge network interface after network rm

cmd/nerdctl/network_rm.go

@@ -82,6 +82,11 @@ func networkRmAction(cmd *cobra.Command, args []string) error {
 			if err := os.RemoveAll(l.File); err != nil {
 				return err
 			}
+			// Remove the bridge network interface on the host.
+			if l.Plugins[0].Network.Type == "bridge" {
+				netIf := fmt.Sprintf("nerdctl%d", *l.NerdctlID)
+				removeBridgeNetworkInterface(netIf)
+			}
 			fmt.Fprintln(cmd.OutOrStdout(), name)
 		}
 		return nil

cmd/nerdctl/network_rm_freebsd.go

@@ -0,0 +1,19 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package main
+
+func removeBridgeNetworkInterface(name string) {}

cmd/nerdctl/network_rm_linux.go

@@ -0,0 +1,31 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package main
+
+import (
+	"github.com/sirupsen/logrus"
+	"github.com/vishvananda/netlink"
+)
+
+func removeBridgeNetworkInterface(netIf string) {
+	link, err := netlink.LinkByName(netIf)
+	if err == nil {
+		if err = netlink.LinkDel(link); err != nil {
+			logrus.Warnf("Failed to remove network interface %s: %v", netIf, err)
+		}
+	}
+}

cmd/nerdctl/network_rm_windows.go

@@ -0,0 +1,19 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package main
+
+func removeBridgeNetworkInterface(name string) {}