opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12757 from umohnani8/cm

Browse Source 
Don't add env if optional and not found
This commit is contained in:
OpenShift Merge Robot
2022-01-10 18:53:08 +01:00
committed by GitHub
parent a957e8c5e2 4dc5a5b15d
commit 8af574fdaa
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/specgen/generate/kube/kube.go
View File

@ -291,7 +291,10 @@ func ToSpecGen(ctx context.Context, opts *CtrSpecGenOptions) (*specgen.SpecGener
return nil, err return nil, err
} }
envs[env.Name] = value // Only set the env if the value is not ""
if value != "" {
envs[env.Name] = value
}
} }
for _, envFrom := range opts.Container.EnvFrom { for _, envFrom := range opts.Container.EnvFrom {
cmEnvs, err := envVarsFrom(envFrom, opts) cmEnvs, err := envVarsFrom(envFrom, opts)

10
test/e2e/play_kube_test.go
View File

@ -1659,7 +1659,7 @@ var _ = Describe("Podman play kube", func() {
inspect := podmanTest.Podman([]string{"inspect", getCtrNameInPod(pod), "--format", "'{{ range .Config.Env }}[{{ . }}]{{end}}'"}) inspect := podmanTest.Podman([]string{"inspect", getCtrNameInPod(pod), "--format", "'{{ range .Config.Env }}[{{ . }}]{{end}}'"})
inspect.WaitWithDefaultTimeout() inspect.WaitWithDefaultTimeout()
Expect(inspect).Should(Exit(0)) Expect(inspect).Should(Exit(0))
Expect(inspect.OutputToString()).To(ContainSubstring(`[FOO=]`)) Expect(inspect.OutputToString()).To(Not(ContainSubstring(`[FOO=]`)))
}) })
It("podman play kube test optional env value from missing configmap", func() { It("podman play kube test optional env value from missing configmap", func() {
@ -1674,7 +1674,7 @@ var _ = Describe("Podman play kube", func() {
inspect := podmanTest.Podman([]string{"inspect", getCtrNameInPod(pod), "--format", "'{{ range .Config.Env }}[{{ . }}]{{end}}'"}) inspect := podmanTest.Podman([]string{"inspect", getCtrNameInPod(pod), "--format", "'{{ range .Config.Env }}[{{ . }}]{{end}}'"})
inspect.WaitWithDefaultTimeout() inspect.WaitWithDefaultTimeout()
Expect(inspect).Should(Exit(0)) Expect(inspect).Should(Exit(0))
Expect(inspect.OutputToString()).To(ContainSubstring(`[FOO=]`)) Expect(inspect.OutputToString()).To(Not(ContainSubstring(`[FOO=]`)))
}) })
It("podman play kube test get all key-value pairs from configmap as envs", func() { It("podman play kube test get all key-value pairs from configmap as envs", func() {
@ -1768,7 +1768,7 @@ var _ = Describe("Podman play kube", func() {
inspect := podmanTest.Podman([]string{"inspect", getCtrNameInPod(pod), "--format", "'{{ range .Config.Env }}[{{ . }}]{{end}}'"}) inspect := podmanTest.Podman([]string{"inspect", getCtrNameInPod(pod), "--format", "'{{ range .Config.Env }}[{{ . }}]{{end}}'"})
inspect.WaitWithDefaultTimeout() inspect.WaitWithDefaultTimeout()
Expect(inspect).Should(Exit(0)) Expect(inspect).Should(Exit(0))
Expect(inspect.OutputToString()).To(ContainSubstring(`[FOO=]`)) Expect(inspect.OutputToString()).To(Not(ContainSubstring(`[FOO=]`)))
}) })
It("podman play kube test optional env value from secret with missing key", func() { It("podman play kube test optional env value from secret with missing key", func() {
@ -1784,7 +1784,7 @@ var _ = Describe("Podman play kube", func() {
inspect := podmanTest.Podman([]string{"inspect", getCtrNameInPod(pod), "--format", "'{{ range .Config.Env }}[{{ . }}]{{end}}'"}) inspect := podmanTest.Podman([]string{"inspect", getCtrNameInPod(pod), "--format", "'{{ range .Config.Env }}[{{ . }}]{{end}}'"})
inspect.WaitWithDefaultTimeout() inspect.WaitWithDefaultTimeout()
Expect(inspect).Should(Exit(0)) Expect(inspect).Should(Exit(0))
Expect(inspect.OutputToString()).To(ContainSubstring(`[FOO=]`)) Expect(inspect.OutputToString()).To(Not(ContainSubstring(`[FOO=]`)))
}) })
It("podman play kube test get all key-value pairs from secret as envs", func() { It("podman play kube test get all key-value pairs from secret as envs", func() {
@ -3212,7 +3212,7 @@ ENV OPENJ9_JAVA_OPTIONS=%q
inspect := podmanTest.Podman([]string{"inspect", getCtrNameInPod(pod), "--format", "'{{ range .Config.Env }}[{{ . }}]{{end}}'"}) inspect := podmanTest.Podman([]string{"inspect", getCtrNameInPod(pod), "--format", "'{{ range .Config.Env }}[{{ . }}]{{end}}'"})
inspect.WaitWithDefaultTimeout() inspect.WaitWithDefaultTimeout()
Expect(inspect).Should(Exit(0)) Expect(inspect).Should(Exit(0))
Expect(inspect.OutputToString()).To(ContainSubstring(`[FOO=]`)) Expect(inspect.OutputToString()).To(Not(ContainSubstring(`[FOO=]`)))
}) })
It("podman play kube uses all key-value pairs as envs", func() { It("podman play kube uses all key-value pairs as envs", func() {