diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-26 15:38:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-26 15:38:27 +0000 |
| commit | 31548609f5c4036c1093be2430986bfc59b879b1 (patch) | |
| tree | 7be151638c93d2b1a1f3475adda54a91d4e92e07 | |
| parent | 4d75df8be380cff4df082bd6fc2f05aa2c433723 (diff) | |
| parent | efd1c080bf17ed662eeeeaf66647afd27ad27894 (diff) | |
| download | podman-31548609f5c4036c1093be2430986bfc59b879b1.tar.gz podman-31548609f5c4036c1093be2430986bfc59b879b1.tar.bz2 podman-31548609f5c4036c1093be2430986bfc59b879b1.zip | |
Merge pull request #12099 from Luap99/cni-k8s-env
[CI:DOCS] Document to not set K8S envars for CNI
| -rw-r--r-- | libpod/network/cni/run.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libpod/network/cni/run.go b/libpod/network/cni/run.go index bd873f89b..99b2adce5 100644 --- a/libpod/network/cni/run.go +++ b/libpod/network/cni/run.go @@ -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{}{}, |