summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2018-11-08 13:45:11 -0600
committerbaude <bbaude@redhat.com>2018-11-08 14:22:10 -0600
commit46e672bad6d7d616961ae0fc7fb0b484951ef07d (patch)
treeb78c6c8ae84507f8d93ffd404b9d721fd53ca6bd
parent85dbfb33f4c20ca75c86abd687fe0f8a31ce080e (diff)
downloadpodman-46e672bad6d7d616961ae0fc7fb0b484951ef07d.tar.gz
podman-46e672bad6d7d616961ae0fc7fb0b484951ef07d.tar.bz2
podman-46e672bad6d7d616961ae0fc7fb0b484951ef07d.zip
correct assignment of networkStatus
once we changed configureNetNS to return a result beyond an error, we need to make sure that we used locals instead of ctr attributes when determining networks. Resolves #1752 Signed-off-by: baude <bbaude@redhat.com>
-rw-r--r--libpod/networking_linux.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go
index 863a764e2..212485d8a 100644
--- a/libpod/networking_linux.go
+++ b/libpod/networking_linux.go
@@ -64,20 +64,20 @@ func (r *Runtime) configureNetNS(ctr *Container, ctrNS ns.NetNS) ([]*cnitypes.Re
}
}()
- networkStatus := make([]*cnitypes.Result, 1)
+ networkStatus := make([]*cnitypes.Result, 0)
for idx, r := range results {
logrus.Debugf("[%d] CNI result: %v", idx, r.String())
resultCurrent, err := cnitypes.GetResult(r)
if err != nil {
return nil, errors.Wrapf(err, "error parsing CNI plugin result %q: %v", r.String(), err)
}
- networkStatus = append(ctr.state.NetworkStatus, resultCurrent)
+ networkStatus = append(networkStatus, resultCurrent)
}
// Add firewall rules to ensure the container has network access.
// Will not be necessary once CNI firewall plugin merges upstream.
// https://github.com/containernetworking/plugins/pull/75
- for _, netStatus := range ctr.state.NetworkStatus {
+ for _, netStatus := range networkStatus {
firewallConf := &firewall.FirewallNetConf{
PrevResult: netStatus,
}