summaryrefslogtreecommitdiff
path: root/libpod/network
diff options
context:
space:
mode:
authorPaul Holzinger <pholzing@redhat.com>2021-10-26 16:11:46 +0200
committerMatthew Heon <matthew.heon@pm.me>2021-11-12 11:08:25 -0500
commit7275d389b6ad3238c800e079238fb098886536de (patch)
tree4d910b42435b5447abd187b30720bc96a8e4870a /libpod/network
parent955d01f5a81ffe376dd883fec118db8256fb450b (diff)
downloadpodman-7275d389b6ad3238c800e079238fb098886536de.tar.gz
podman-7275d389b6ad3238c800e079238fb098886536de.tar.bz2
podman-7275d389b6ad3238c800e079238fb098886536de.zip
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 <pholzing@redhat.com>
Diffstat (limited to 'libpod/network')
-rw-r--r--libpod/network/cni/run.go6
1 files changed, 2 insertions, 4 deletions
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{}{},