Merge pull request #10202 from EduardoVega/9763-kube-auto-update

Add support to preserve auto-update labels in play / generate kube

2 files changed, 131 insertions, 0 deletions

diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go
index 611e8ddac..4c0fc6db0 100644
--- a/test/e2e/generate_kube_test.go
+++ b/test/e2e/generate_kube_test.go
@@ -873,4 +873,54 @@ USER test1`
 			}
 		}
 	})
+
+	It("podman generate kube on container with auto update labels", func() {
+		top := podmanTest.Podman([]string{"run", "-dt", "--name", "top", "--label", "io.containers.autoupdate=local", ALPINE, "top"})
+		top.WaitWithDefaultTimeout()
+		Expect(top.ExitCode()).To(Equal(0))
+
+		kube := podmanTest.Podman([]string{"generate", "kube", "top"})
+		kube.WaitWithDefaultTimeout()
+		Expect(kube.ExitCode()).To(Equal(0))
+
+		pod := new(v1.Pod)
+		err := yaml.Unmarshal(kube.Out.Contents(), pod)
+		Expect(err).To(BeNil())
+
+		v, ok := pod.GetAnnotations()["io.containers.autoupdate/top"]
+		Expect(ok).To(Equal(true))
+		Expect(v).To(Equal("local"))
+	})
+
+	It("podman generate kube on pod with auto update labels in all containers", func() {
+		pod1 := podmanTest.Podman([]string{"pod", "create", "--name", "pod1"})
+		pod1.WaitWithDefaultTimeout()
+		Expect(pod1.ExitCode()).To(Equal(0))
+
+		top1 := podmanTest.Podman([]string{"run", "-dt", "--name", "top1", "--pod", "pod1", "--label", "io.containers.autoupdate=registry", "--label", "io.containers.autoupdate.authfile=/some/authfile.json", ALPINE, "top"})
+		top1.WaitWithDefaultTimeout()
+		Expect(top1.ExitCode()).To(Equal(0))
+
+		top2 := podmanTest.Podman([]string{"run", "-dt", "--name", "top2", "--pod", "pod1", "--label", "io.containers.autoupdate=registry", "--label", "io.containers.autoupdate.authfile=/some/authfile.json", ALPINE, "top"})
+		top2.WaitWithDefaultTimeout()
+		Expect(top2.ExitCode()).To(Equal(0))
+
+		kube := podmanTest.Podman([]string{"generate", "kube", "pod1"})
+		kube.WaitWithDefaultTimeout()
+		Expect(kube.ExitCode()).To(Equal(0))
+
+		pod := new(v1.Pod)
+		err := yaml.Unmarshal(kube.Out.Contents(), pod)
+		Expect(err).To(BeNil())
+
+		for _, ctr := range []string{"top1", "top2"} {
+			v, ok := pod.GetAnnotations()["io.containers.autoupdate/"+ctr]
+			Expect(ok).To(Equal(true))
+			Expect(v).To(Equal("registry"))
+
+			v, ok = pod.GetAnnotations()["io.containers.autoupdate.authfile/"+ctr]
+			Expect(ok).To(Equal(true))
+			Expect(v).To(Equal("/some/authfile.json"))
+		}
+	})
 })
diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go
index dc3913394..3908d4075 100644
--- a/test/e2e/play_kube_test.go
+++ b/test/e2e/play_kube_test.go
@@ -768,6 +768,12 @@ func getCtr(options ...ctrOption) *Ctr {
 
 type ctrOption func(*Ctr)
 
+func withName(name string) ctrOption {
+	return func(c *Ctr) {
+		c.Name = name
+	}
+}
+
 func withCmd(cmd []string) ctrOption {
 	return func(c *Ctr) {
 		c.Cmd = cmd
@@ -2304,4 +2310,79 @@ invalid kube kind
 		kube.WaitWithDefaultTimeout()
 		Expect(kube.ExitCode()).To(Not(Equal(0)))
 	})
+
+	It("podman play kube with auto update annotations for all containers", func() {
+		ctr01Name := "ctr01"
+		ctr02Name := "ctr02"
+		podName := "foo"
+		autoUpdateRegistry := "io.containers.autoupdate"
+		autoUpdateRegistryValue := "registry"
+		autoUpdateAuthfile := "io.containers.autoupdate.authfile"
+		autoUpdateAuthfileValue := "/some/authfile.json"
+
+		ctr01 := getCtr(withName(ctr01Name))
+		ctr02 := getCtr(withName(ctr02Name))
+
+		pod := getPod(
+			withPodName(podName),
+			withCtr(ctr01),
+			withCtr(ctr02),
+			withAnnotation(autoUpdateRegistry, autoUpdateRegistryValue),
+			withAnnotation(autoUpdateAuthfile, autoUpdateAuthfileValue))
+
+		err = generateKubeYaml("pod", pod, kubeYaml)
+		Expect(err).To(BeNil())
+
+		kube := podmanTest.Podman([]string{"play", "kube", kubeYaml})
+		kube.WaitWithDefaultTimeout()
+		Expect(kube.ExitCode()).To(Equal(0))
+
+		for _, ctr := range []string{podName + "-" + ctr01Name, podName + "-" + ctr02Name} {
+			inspect := podmanTest.Podman([]string{"inspect", ctr, "--format", "'{{.Config.Labels}}'"})
+			inspect.WaitWithDefaultTimeout()
+			Expect(inspect.ExitCode()).To(Equal(0))
+
+			Expect(inspect.OutputToString()).To(ContainSubstring(autoUpdateRegistry + ":" + autoUpdateRegistryValue))
+			Expect(inspect.OutputToString()).To(ContainSubstring(autoUpdateAuthfile + ":" + autoUpdateAuthfileValue))
+		}
+	})
+
+	It("podman play kube with auto update annotations for first container only", func() {
+		ctr01Name := "ctr01"
+		ctr02Name := "ctr02"
+		autoUpdateRegistry := "io.containers.autoupdate"
+		autoUpdateRegistryValue := "local"
+
+		ctr01 := getCtr(withName(ctr01Name))
+		ctr02 := getCtr(withName(ctr02Name))
+
+		pod := getPod(
+			withCtr(ctr01),
+			withCtr(ctr02),
+		)
+
+		deployment := getDeployment(
+			withPod(pod),
+			withDeploymentAnnotation(autoUpdateRegistry+"/"+ctr01Name, autoUpdateRegistryValue),
+		)
+
+		err = generateKubeYaml("deployment", deployment, kubeYaml)
+		Expect(err).To(BeNil())
+
+		kube := podmanTest.Podman([]string{"play", "kube", kubeYaml})
+		kube.WaitWithDefaultTimeout()
+		Expect(kube.ExitCode()).To(Equal(0))
+
+		podName := getPodNamesInDeployment(deployment)[0].Name
+
+		inspect := podmanTest.Podman([]string{"inspect", podName + "-" + ctr01Name, "--format", "'{{.Config.Labels}}'"})
+		inspect.WaitWithDefaultTimeout()
+		Expect(inspect.ExitCode()).To(Equal(0))
+		Expect(inspect.OutputToString()).To(ContainSubstring(autoUpdateRegistry + ":" + autoUpdateRegistryValue))
+
+		inspect = podmanTest.Podman([]string{"inspect", podName + "-" + ctr02Name, "--format", "'{{.Config.Labels}}'"})
+		inspect.WaitWithDefaultTimeout()
+		Expect(inspect.ExitCode()).To(Equal(0))
+		Expect(inspect.OutputToString()).To(ContainSubstring(`map[]`))
+	})
 })