diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-22 18:35:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 18:35:48 -0400 |
| commit | c58a677f8edc36c32728a87a6ac2c48d244d7ea2 (patch) | |
| tree | 9036af20111c5dfff60cf92dc930f5e528df8a2d /libpod/kube.go | |
| parent | 20587dfb7d26781aaa31b11c984f7dec8e79a282 (diff) | |
| parent | 8ee18bde152da71f1b7ba9d7575324321be630d6 (diff) | |
| download | podman-c58a677f8edc36c32728a87a6ac2c48d244d7ea2.tar.gz podman-c58a677f8edc36c32728a87a6ac2c48d244d7ea2.tar.bz2 podman-c58a677f8edc36c32728a87a6ac2c48d244d7ea2.zip | |
Merge pull request #11705 from mheon/340
Release 3.4.0-rc2 (inc. backports)
Diffstat (limited to 'libpod/kube.go')
| -rw-r--r-- | libpod/kube.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libpod/kube.go b/libpod/kube.go index 812bb101b..af3b0916e 100644 --- a/libpod/kube.go +++ b/libpod/kube.go @@ -10,6 +10,7 @@ import ( "time" "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/env" "github.com/containers/podman/v3/pkg/lookup" "github.com/containers/podman/v3/pkg/namespaces" "github.com/containers/podman/v3/pkg/specgen" @@ -570,12 +571,16 @@ func ocicniPortMappingToContainerPort(portMappings []ocicni.PortMapping) ([]v1.C // libpodEnvVarsToKubeEnvVars converts a key=value string slice to []v1.EnvVar func libpodEnvVarsToKubeEnvVars(envs []string) ([]v1.EnvVar, error) { + defaultEnv := env.DefaultEnvVariables() envVars := make([]v1.EnvVar, 0, len(envs)) for _, e := range envs { split := strings.SplitN(e, "=", 2) if len(split) != 2 { return envVars, errors.Errorf("environment variable %s is malformed; should be key=value", e) } + if defaultEnv[split[0]] == split[1] { + continue + } ev := v1.EnvVar{ Name: split[0], Value: split[1], |