summaryrefslogtreecommitdiff
path: root/pkg/env
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-09-21 09:03:28 -0400
committerMatthew Heon <matthew.heon@pm.me>2021-09-22 16:49:15 -0400
commit72e19cf51e88cdbdc8431c242e4670323eac3379 (patch)
tree03d0b00ade2b73761605a4246133ea8f1129488e /pkg/env
parent909cbfe217204ef6beceea9f6983974338d524e1 (diff)
downloadpodman-72e19cf51e88cdbdc8431c242e4670323eac3379.tar.gz
podman-72e19cf51e88cdbdc8431c242e4670323eac3379.tar.bz2
podman-72e19cf51e88cdbdc8431c242e4670323eac3379.zip
Generate kube should'd add podman default environment vars
Currently we add the default PATH, TERM and container from Podman to every kubernetes.yaml file. These values should not be recorded in the yaml files. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> <MH: Fixed cherry-pick conflicts> Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'pkg/env')
-rw-r--r--pkg/env/env.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/env/env.go b/pkg/env/env.go
index 0d55e5560..ecd2d62a5 100644
--- a/pkg/env/env.go
+++ b/pkg/env/env.go
@@ -17,8 +17,9 @@ const whiteSpaces = " \t"
// DefaultEnvVariables returns a default environment, with $PATH and $TERM set.
func DefaultEnvVariables() map[string]string {
return map[string]string{
- "PATH": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
- "TERM": "xterm",
+ "PATH": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+ "TERM": "xterm",
+ "container": "podman",
}
}