Skip to content

Commit 2000b4b

Browse files
committed
sdn: no longer kill docker0
We no longer use docker for IPAM, so we don't need to mess with docker networking at all. Don't kill docker0 anymore on openshift-sdn startup.
1 parent dca211b commit 2000b4b

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

pkg/sdn/plugin/controller.go

-8
Original file line numberDiff line numberDiff line change
@@ -308,14 +308,6 @@ func (plugin *OsdnNode) SetupSDN() (bool, error) {
308308
return false, err
309309
}
310310

311-
// Clean up docker0 since docker won't
312-
itx = ipcmd.NewTransaction(exec, "docker0")
313-
itx.SetLink("down")
314-
itx.IgnoreError()
315-
itx.DeleteLink()
316-
itx.IgnoreError()
317-
_ = itx.EndTransaction()
318-
319311
sysctl := sysctl.New()
320312

321313
// Enable IP forwarding for ipv4 packets

0 commit comments

Comments
 (0)