opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 03:52:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12099 from Luap99/cni-k8s-env

Browse Source 
[CI:DOCS] Document to not set K8S envars for CNI
This commit is contained in:
OpenShift Merge Robot
2021-10-26 15:38:27 +00:00
committed by GitHub
parent 4d75df8be3 efd1c080bf
commit 31548609f5
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/network/cni/run.go
View File

@ -196,10 +196,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{}{},