diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-15 00:43:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-15 00:43:16 -0700 |
| commit | d10f68ac95e13535f90d9b643ac2d7530178c21d (patch) | |
| tree | bf31d22dd96ecc0688b8dc5301f390dc9a77c456 /cmd/podman/play_kube.go | |
| parent | 167ce59416f6e03f4477269e33e9e5cf5b700a86 (diff) | |
| parent | e61838bc3b25faba708856e2208aa2026381a341 (diff) | |
| download | podman-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/podman/play_kube.go')
| -rw-r--r-- | cmd/podman/play_kube.go | 8 |
1 files changed, 4 insertions, 4 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 |