diff options
author | 荒野無燈 <ttys3.rust@gmail.com> | 2021-12-18 08:37:24 +0800 |
---|---|---|
committer | 荒野無燈 <ttys3.rust@gmail.com> | 2021-12-18 09:25:37 +0800 |
commit | af6bcd086794668889a2695e02ea89cff966ae35 (patch) | |
tree | 75679d9f07be0a8fdbd1b215e0cf291a981198e2 /test/e2e | |
parent | 59766ebe76fe5bdd15256f5d39d063c95304989f (diff) | |
download | podman-af6bcd086794668889a2695e02ea89cff966ae35.tar.gz podman-af6bcd086794668889a2695e02ea89cff966ae35.tar.bz2 podman-af6bcd086794668889a2695e02ea89cff966ae35.zip |
fix(generate): fix up podman generate kube missing env field bug
the logic is: if the process env vars key exists in podman default or in image defined, and the value is equal, skip the env var key.
the typo make it compare to itself -_-
so, here comes the simple fixup.
Signed-off-by: 荒野無燈 <ttys3.rust@gmail.com>
Diffstat (limited to 'test/e2e')
-rw-r--r-- | test/e2e/generate_kube_test.go | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go index cfa264de2..16f2c4272 100644 --- a/test/e2e/generate_kube_test.go +++ b/test/e2e/generate_kube_test.go @@ -1100,4 +1100,28 @@ USER test1` Expect(pod.GetAnnotations()).To(HaveKeyWithValue("io.containers.autoupdate.authfile/"+ctr, "/some/authfile.json")) } }) + + It("podman generate kube can export env variables correctly", func() { + // Fixes https://github.com/containers/podman/issues/12647 + // PR https://github.com/containers/podman/pull/12648 + + ctrName := "gen-kube-env-ctr" + podName := "gen-kube-env" + session1 := podmanTest.Podman([]string{"run", "-d", "--pod", "new:" + podName, "--name", ctrName, + "-e", "FOO=bar", + "-e", "HELLO=WORLD", + "alpine", "top"}) + session1.WaitWithDefaultTimeout() + Expect(session1).Should(Exit(0)) + + kube := podmanTest.Podman([]string{"generate", "kube", podName}) + kube.WaitWithDefaultTimeout() + Expect(kube).Should(Exit(0)) + + pod := new(v1.Pod) + err := yaml.Unmarshal(kube.Out.Contents(), pod) + Expect(err).To(BeNil()) + + Expect(pod.Spec.Containers[0].Env).To(HaveLen(2)) + }) }) |