From 34739f44131e9c493c4021d119c368c82d080c84 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 24 Oct 2021 22:23:13 +0200 Subject: Replace 'an user' => 'a user' Signed-off-by: Stefan Weil --- libpod/network/cni/cni_types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libpod/network') 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() -- cgit v1.2.3-54-g00ecf From 7275d389b6ad3238c800e079238fb098886536de Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 26 Oct 2021 16:11:46 +0200 Subject: Document to not set K8S envars for CNI Setting these environment variables can cause issues with custom CNI plugins, see #12083. Signed-off-by: Paul Holzinger --- libpod/network/cni/run.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libpod/network') 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{}{}, -- cgit v1.2.3-54-g00ecf