summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-04-15 00:43:16 -0700
committerGitHub <noreply@github.com>2019-04-15 00:43:16 -0700
commitd10f68ac95e13535f90d9b643ac2d7530178c21d (patch)
treebf31d22dd96ecc0688b8dc5301f390dc9a77c456 /cmd
parent167ce59416f6e03f4477269e33e9e5cf5b700a86 (diff)
parente61838bc3b25faba708856e2208aa2026381a341 (diff)
downloadpodman-d10f68ac95e13535f90d9b643ac2d7530178c21d.tar.gz
podman-d10f68ac95e13535f90d9b643ac2d7530178c21d.tar.bz2
podman-d10f68ac95e13535f90d9b643ac2d7530178c21d.zip
Merge pull request #2932 from haircommander/kube-env
Incorporate image and default environment variables in play kube
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/play_kube.go8
-rw-r--r--cmd/podman/shared/create.go29
2 files changed, 22 insertions, 15 deletions
diff --git a/cmd/podman/play_kube.go b/cmd/podman/play_kube.go
index cbe961279..942794cbe 100644
--- a/cmd/podman/play_kube.go
+++ b/cmd/podman/play_kube.go
@@ -236,7 +236,6 @@ func getPodPorts(containers []v1.Container) []ocicni.PortMapping {
func kubeContainerToCreateConfig(ctx context.Context, containerYAML v1.Container, runtime *libpod.Runtime, newImage *image.Image, namespaces map[string]string, volumes map[string]string) (*createconfig.CreateConfig, error) {
var (
containerConfig createconfig.CreateConfig
- envs map[string]string
)
// The default for MemorySwappiness is -1, not 0
@@ -298,9 +297,10 @@ func kubeContainerToCreateConfig(ctx context.Context, containerYAML v1.Container
if len(containerConfig.WorkDir) == 0 {
containerConfig.WorkDir = "/"
}
- if len(containerYAML.Env) > 0 {
- envs = make(map[string]string)
- }
+
+ // Set default environment variables and incorporate data from image, if necessary
+ envs := shared.EnvVariablesFromData(imageData)
+
// Environment Variables
for _, e := range containerYAML.Env {
envs[e.Name] = e.Value
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go
index d694027db..a1c096853 100644
--- a/cmd/podman/shared/create.go
+++ b/cmd/podman/shared/create.go
@@ -489,17 +489,7 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod.
}
// ENVIRONMENT VARIABLES
- env := defaultEnvVariables
- if data != nil {
- for _, e := range data.Config.Env {
- split := strings.SplitN(e, "=", 2)
- if len(split) > 1 {
- env[split[0]] = split[1]
- } else {
- env[split[0]] = ""
- }
- }
- }
+ env := EnvVariablesFromData(data)
if err := parse.ReadKVStrings(env, c.StringSlice("env-file"), c.StringArray("env")); err != nil {
return nil, errors.Wrapf(err, "unable to process environment variables")
}
@@ -781,6 +771,23 @@ var defaultEnvVariables = map[string]string{
"TERM": "xterm",
}
+// EnvVariablesFromData gets sets the default environment variables
+// for containers, and reads the variables from the image data, if present.
+func EnvVariablesFromData(data *inspect.ImageData) map[string]string {
+ env := defaultEnvVariables
+ if data != nil {
+ for _, e := range data.Config.Env {
+ split := strings.SplitN(e, "=", 2)
+ if len(split) > 1 {
+ env[split[0]] = split[1]
+ } else {
+ env[split[0]] = ""
+ }
+ }
+ }
+ return env
+}
+
func makeHealthCheckFromCli(c *GenericCLIResults) (*manifest.Schema2HealthConfig, error) {
inCommand := c.String("healthcheck-command")
inInterval := c.String("healthcheck-interval")