diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-23 12:04:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-23 12:04:38 +0100 |
| commit | e34ec617a3ea5758a173579b879897a52fbd1c60 (patch) | |
| tree | e4af931687d4941fd4c9ebdad2945dfa70b78660 /libpod/container_internal_linux.go | |
| parent | 72a2011cb12a2fbf74abf7c32fba8505a5f4e8f6 (diff) | |
| parent | b6954758bb17f846f81fada71385a94b5072e91c (diff) | |
| download | podman-e34ec617a3ea5758a173579b879897a52fbd1c60.tar.gz podman-e34ec617a3ea5758a173579b879897a52fbd1c60.tar.bz2 podman-e34ec617a3ea5758a173579b879897a52fbd1c60.zip | |
Merge pull request #5434 from mheon/force_delete_cni_netreg
Attempt manual removal of CNI IP allocations on refresh
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 63968918c..2f0f59c24 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -1436,13 +1436,6 @@ func (c *Container) copyOwnerAndPerms(source, dest string) error { return nil } -// Teardown CNI config on refresh -func (c *Container) refreshCNI() error { - // Let's try and delete any lingering network config... - podNetwork := c.runtime.getPodNetwork(c.ID(), c.config.Name, "", c.config.Networks, c.config.PortMappings, c.config.StaticIP, c.config.StaticMAC) - return c.runtime.netPlugin.TearDownPod(podNetwork) -} - // Get cgroup path in a format suitable for the OCI spec func (c *Container) getOCICgroupPath() (string, error) { unified, err := cgroups.IsCgroup2UnifiedMode() |