summaryrefslogtreecommitdiff
path: root/test/e2e/generate_kube_test.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-11 08:53:00 -0400
committerGitHub <noreply@github.com>2020-06-11 08:53:00 -0400
commitb62e50f53b9e65c86e877bb931fa53602eba53c7 (patch)
treee1e90e90f67c22c7fabe1f426ce9a3e512627675 /test/e2e/generate_kube_test.go
parent09e4faa7dfa99719d67039a9e39bebb5376d9ecb (diff)
parent162c1d812bd875a015c428119eac7fbabbe6c8ff (diff)
downloadpodman-b62e50f53b9e65c86e877bb931fa53602eba53c7.tar.gz
podman-b62e50f53b9e65c86e877bb931fa53602eba53c7.tar.bz2
podman-b62e50f53b9e65c86e877bb931fa53602eba53c7.zip
Merge pull request #6256 from theunrealgeek/play_kube_deployment
Support k8s Deployment in play kube
Diffstat (limited to 'test/e2e/generate_kube_test.go')
-rw-r--r--test/e2e/generate_kube_test.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go
index db750bfcc..7872a9fbf 100644
--- a/test/e2e/generate_kube_test.go
+++ b/test/e2e/generate_kube_test.go
@@ -282,7 +282,8 @@ var _ = Describe("Podman generate kube", func() {
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
- inspect1 := podmanTest.Podman([]string{"inspect", "--format", "{{.Config.User}}", "test1"})
+ // container name in pod is <podName>-<ctrName>
+ inspect1 := podmanTest.Podman([]string{"inspect", "--format", "{{.Config.User}}", "toppod-test1"})
inspect1.WaitWithDefaultTimeout()
Expect(inspect1.ExitCode()).To(Equal(0))
Expect(inspect1.OutputToString()).To(ContainSubstring(inspect.OutputToString()))
@@ -295,6 +296,7 @@ var _ = Describe("Podman generate kube", func() {
// we need a container name because IDs don't persist after rm/play
ctrName := "test-ctr"
+ ctrNameInKubePod := "test1-test-ctr"
session1 := podmanTest.Podman([]string{"run", "-d", "--pod", "new:test1", "--name", ctrName, "-v", vol1 + ":/volume/:z", "alpine", "top"})
session1.WaitWithDefaultTimeout()
@@ -313,7 +315,7 @@ var _ = Describe("Podman generate kube", func() {
play.WaitWithDefaultTimeout()
Expect(play.ExitCode()).To(Equal(0))
- inspect := podmanTest.Podman([]string{"inspect", ctrName})
+ inspect := podmanTest.Podman([]string{"inspect", ctrNameInKubePod})
inspect.WaitWithDefaultTimeout()
Expect(inspect.ExitCode()).To(Equal(0))
Expect(inspect.OutputToString()).To(ContainSubstring(vol1))