diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-12 19:37:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-12 19:37:46 +0100 |
| commit | 4808a63e5f1ad72d754c61c005c2c7c29ce48014 (patch) | |
| tree | 3cfdd9e9f89024798a1bcd26dd56d4c7140d923d /libpod/network | |
| parent | fd010adfdcb6f578623b77281f2ae012bcd1ac85 (diff) | |
| parent | 7c98d542b4c5ab0495f66a9179ae886e86cad273 (diff) | |
| download | podman-4808a63e5f1ad72d754c61c005c2c7c29ce48014.tar.gz podman-4808a63e5f1ad72d754c61c005c2c7c29ce48014.tar.bz2 podman-4808a63e5f1ad72d754c61c005c2c7c29ce48014.zip | |
Merge pull request #12274 from mheon/bump_342
Bump to v3.4.2
Diffstat (limited to 'libpod/network')
| -rw-r--r-- | libpod/network/cni/cni_types.go | 2 | ||||
| -rw-r--r-- | libpod/network/cni/run.go | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/libpod/network/cni/cni_types.go b/libpod/network/cni/cni_types.go index 91fd1c27b..35548f4f9 100644 --- a/libpod/network/cni/cni_types.go +++ b/libpod/network/cni/cni_types.go @@ -175,7 +175,7 @@ func newIPAMLocalHostRange(subnet types.IPNet, leaseRange *types.LeaseRange, gw Subnet: subnet.String(), } - // an user provided a range, we add it here + // a user provided a range, we add it here if leaseRange != nil { if leaseRange.StartIP != nil { hostRange.RangeStart = leaseRange.StartIP.String() diff --git a/libpod/network/cni/run.go b/libpod/network/cni/run.go index 14634262c..3f78d79a4 100644 --- a/libpod/network/cni/run.go +++ b/libpod/network/cni/run.go @@ -199,10 +199,8 @@ func getRuntimeConfig(netns, conName, conID, networkName string, ports []cniPort IfName: opts.InterfaceName, Args: [][2]string{ {"IgnoreUnknown", "1"}, - // FIXME: Should we set the K8S args? - //{"K8S_POD_NAMESPACE", conName}, - //{"K8S_POD_INFRA_CONTAINER_ID", conID}, - // K8S_POD_NAME is used by dnsname to get the container name + // Do not set the K8S env vars, see https://github.com/containers/podman/issues/12083. + // Only K8S_POD_NAME is used by dnsname to get the container name. {"K8S_POD_NAME", conName}, }, CapabilityArgs: map[string]interface{}{}, |