summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-09-21 11:27:43 -0400
committerGitHub <noreply@github.com>2021-09-21 11:27:43 -0400
commitf2c2e1c5202b7186f9310050b298ef73486d5e5b (patch)
tree39f138c81e1fe2b8931e3e3d7c566990db02d513 /pkg
parentb922e61cec379c136d4138f13e4fc44d2fa3df11 (diff)
parent185294cb8c8945f7a1ec43429426f61f14bcb7fc (diff)
downloadpodman-f2c2e1c5202b7186f9310050b298ef73486d5e5b.tar.gz
podman-f2c2e1c5202b7186f9310050b298ef73486d5e5b.tar.bz2
podman-f2c2e1c5202b7186f9310050b298ef73486d5e5b.zip
Merge pull request #11676 from rhatdan/kube
Generate kube shouldn't add podman default environment vars
Diffstat (limited to 'pkg')
-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",
}
}