Merge pull request #16299 from alexlarsson/quadlet-shortname-warning

quadlet: Warn in generator if using short names
2025-12-02 11:08:36 +08:00 · 2022-11-18 20:01:39 +00:00
parent fc07f9d4fc 7ec743fe74
commit cea9340242
29 changed files with 150 additions and 36 deletions
--- a/test/e2e/quadlet/annotation.container
+++ b/test/e2e/quadlet/annotation.container
@@ -1,11 +1,11 @@
-## assert-podman-final-args imagename
+## assert-podman-final-args localhost/imagename
 ## assert-podman-args "--annotation" "org.foo.Arg0=arg0"
 ## assert-podman-args "--annotation" "org.foo.Arg1=arg1"
 ## assert-podman-args "--annotation" "org.foo.Arg2=arg 2"
 ## assert-podman-args "--annotation" "org.foo.Arg3=arg3"

 [Container]
-Image=imagename
+Image=localhost/imagename
 Annotation=org.foo.Arg1=arg1 "org.foo.Arg2=arg 2" \
  org.foo.Arg3=arg3

--- a/test/e2e/quadlet/basepodman.container
+++ b/test/e2e/quadlet/basepodman.container
@@ -1,7 +1,7 @@
-## assert-podman-final-args run --name=systemd-%N --cidfile=%t/%N.cid --replace --rm -d --log-driver passthrough --pull=never --runtime /usr/bin/crun --cgroups=split --sdnotify=conmon imagename
+## assert-podman-final-args run --name=systemd-%N --cidfile=%t/%N.cid --replace --rm -d --log-driver passthrough --pull=never --runtime /usr/bin/crun --cgroups=split --sdnotify=conmon localhost/imagename

 [Container]
-Image=imagename
+Image=localhost/imagename

 # Disable all default features to get as empty podman run command as we can
 ReadOnly=no
--- a/test/e2e/quadlet/basic.container
+++ b/test/e2e/quadlet/basic.container
@@ -1,4 +1,4 @@
-## assert-podman-final-args imagename
+## assert-podman-final-args localhost/imagename
 ## assert-podman-args "--name=systemd-%N"
 ## assert-podman-args "--cidfile=%t/%N.cid"
 ## assert-podman-args "--rm"
@@ -25,4 +25,4 @@
 ## assert-key-is "Service" "Environment" "PODMAN_SYSTEMD_UNIT=%n"

 [Container]
-Image=imagename
+Image=localhost/imagename
--- a/test/e2e/quadlet/capabilities.container
+++ b/test/e2e/quadlet/capabilities.container
@@ -4,7 +4,7 @@
 ## assert-podman-args "--cap-add=cap_ipc_owner"

 [Container]
-Image=imagename
+Image=localhost/imagename
 # Verify that we can reset to the default cap set
 DropCapability=
 AddCapability=CAP_DAC_OVERRIDE CAP_AUDIT_WRITE
--- a/test/e2e/quadlet/env.container
+++ b/test/e2e/quadlet/env.container
@@ -1,4 +1,4 @@
-## assert-podman-final-args imagename
+## assert-podman-final-args localhost/imagename
 ## assert-podman-args --env "FOO1=foo1"
 ## assert-podman-args --env "FOO2=foo2 "
 ## assert-podman-args --env "FOO3=foo3"
@@ -6,7 +6,7 @@
 ## assert-podman-args --env "FOO4=foo\\nfoo"

 [Container]
-Image=imagename
+Image=localhost/imagename
 Environment=FOO1=foo1 "FOO2=foo2 " \
                     FOO3=foo3 REPLACE=replace
 Environment=REPLACE=replaced 'FOO4=foo\nfoo'
--- a/test/e2e/quadlet/escapes.container
+++ b/test/e2e/quadlet/escapes.container
@@ -1,5 +1,5 @@
 ## assert-podman-final-args "/some/path" "an arg" "a;b\\nc\\td'e" "a;b\\nc\\td" "a\"b"

 [Container]
-Image=imagename
+Image=localhost/imagename
 Exec=/some/path "an arg" "a;b\nc\td'e" a;b\nc\td 'a"b'
--- a/test/e2e/quadlet/exec.container
+++ b/test/e2e/quadlet/exec.container
@@ -1,6 +1,6 @@
-## assert-podman-final-args imagename "/some/binary file" "--arg1" "arg 2"
+## assert-podman-final-args localhost/imagename "/some/binary file" "--arg1" "arg 2"

 [Container]
-Image=imagename
+Image=localhost/imagename
 Exec="/some/binary file" --arg1 \
  "arg 2"
--- a/test/e2e/quadlet/image.container
+++ b/test/e2e/quadlet/image.container
@@ -1,4 +1,4 @@
-## assert-podman-final-args imagename
+## assert-podman-final-args localhost/imagename

 [Container]
-Image=imagename
+Image=localhost/imagename
--- a/test/e2e/quadlet/install.container
+++ b/test/e2e/quadlet/install.container
@@ -9,7 +9,7 @@
 ## assert-symlink req3.service.requires/install.service ../install.service

 [Container]
-Image=imagename
+Image=localhost/imagename

 [Install]
 Alias=alias.service \
--- a/test/e2e/quadlet/label.container
+++ b/test/e2e/quadlet/label.container
@@ -1,11 +1,11 @@
-## assert-podman-final-args imagename
+## assert-podman-final-args localhost/imagename
 ## assert-podman-args "--label" "org.foo.Arg0=arg0"
 ## assert-podman-args "--label" "org.foo.Arg1=arg1"
 ## assert-podman-args "--label" "org.foo.Arg2=arg 2"
 ## assert-podman-args "--label" "org.foo.Arg3=arg3"

 [Container]
-Image=imagename
+Image=localhost/imagename
 Label=org.foo.Arg1=arg1 "org.foo.Arg2=arg 2" \
  org.foo.Arg3=arg3

--- a/test/e2e/quadlet/name.container
+++ b/test/e2e/quadlet/name.container
@@ -1,5 +1,5 @@
 ## assert-podman-args "--name=foobar"

 [Container]
-Image=imagename
+Image=localhost/imagename
 ContainerName=foobar
--- a/test/e2e/quadlet/noremapuser.container
+++ b/test/e2e/quadlet/noremapuser.container
@@ -2,5 +2,5 @@
 ## !assert-podman-args --gidmap

 [Container]
-Image=imagename
+Image=localhost/imagename
 RemapUsers=no
--- a/test/e2e/quadlet/noremapuser2.container
+++ b/test/e2e/quadlet/noremapuser2.container
@@ -20,7 +20,7 @@
 ## assert-podman-args --gidmap 1002:1002:4294966293

 [Container]
-Image=imagename
+Image=localhost/imagename
 RemapUsers=no
 User=1000
 Group=1001
--- a/test/e2e/quadlet/notify.container
+++ b/test/e2e/quadlet/notify.container
@@ -1,5 +1,5 @@
 ## assert-podman-args "--sdnotify=container"

 [Container]
-Image=imagename
+Image=localhost/imagename
 Notify=yes
--- a/test/e2e/quadlet/other-sections.container
+++ b/test/e2e/quadlet/other-sections.container
@@ -1,10 +1,10 @@
-## assert-podman-final-args imagename
+## assert-podman-final-args localhost/imagename
 ## assert-key-is "Unit" "Foo" "bar1" "bar2"
-## assert-key-is "X-Container" "Image" "imagename"
+## assert-key-is "X-Container" "Image" "localhost/imagename"

 [Unit]
 Foo=bar1
 Foo=bar2

 [Container]
-Image=imagename
+Image=localhost/imagename
--- a/test/e2e/quadlet/podmanargs.container
+++ b/test/e2e/quadlet/podmanargs.container
@@ -3,7 +3,7 @@
 ## assert-podman-args "--also"

 [Container]
-Image=imagename
+Image=localhost/imagename
 PodmanArgs="--foo" \
  --bar
 PodmanArgs=--also
--- a/test/e2e/quadlet/ports.container
+++ b/test/e2e/quadlet/ports.container
@@ -1,5 +1,5 @@
 [Container]
-Image=imagename
+Image=localhost/imagename
 ## assert-podman-args --expose=1000
 ExposeHostPort=1000
 ## assert-podman-args --expose=2000-3000
--- a/test/e2e/quadlet/ports_ipv6.container
+++ b/test/e2e/quadlet/ports_ipv6.container
@@ -1,5 +1,5 @@
 [Container]
-Image=imagename
+Image=localhost/imagename
 ## assert-podman-args -p=[::1]:80:90
 PublishPort=[::1]:80:90

--- a/test/e2e/quadlet/shortname.container
+++ b/test/e2e/quadlet/shortname.container
@@ -0,0 +1,4 @@
+## assert-stderr-contains "not a fully qualified image name"
+
+[Container]
+Image=shortname
--- a/test/e2e/quadlet/socketactivated.container
+++ b/test/e2e/quadlet/socketactivated.container
@@ -5,5 +5,5 @@
 ## assert-key-is "Service" "NotifyAccess" "all"

 [Container]
-Image=imagename
+Image=localhost/imagename
 SocketActivated=yes
--- a/test/e2e/quadlet/timezone.container
+++ b/test/e2e/quadlet/timezone.container
@@ -1,5 +1,5 @@
 ## assert-podman-args --tz=foo

 [Container]
-Image=imagename
+Image=localhost/imagename
 Timezone=foo
--- a/test/e2e/quadlet/user-host.container
+++ b/test/e2e/quadlet/user-host.container
@@ -11,7 +11,7 @@
 ## assert-podman-args --gidmap 1002:101000:99000

 [Container]
-Image=imagename
+Image=localhost/imagename
 User=1000
 HostUser=900
 Group=1001
--- a/test/e2e/quadlet/user-root1.container
+++ b/test/e2e/quadlet/user-root1.container
@@ -14,7 +14,7 @@
 # This means container root must map to something else

 [Container]
-Image=imagename
+Image=localhost/imagename
 User=1000
 # Also test name parsing
 HostUser=root
--- a/test/e2e/quadlet/user-root2.container
+++ b/test/e2e/quadlet/user-root2.container
@@ -10,7 +10,7 @@
 # Map container uid root to host root

 [Container]
-Image=imagename
+Image=localhost/imagename
 User=0
 # Also test name parsing
 HostUser=root
--- a/test/e2e/quadlet/user.container
+++ b/test/e2e/quadlet/user.container
@@ -1,7 +1,7 @@
-## assert-podman-final-args imagename
+## assert-podman-final-args localhost/imagename
 ## assert-podman-args "--user" "998:999"

 [Container]
-Image=imagename
+Image=localhost/imagename
 User=998
 Group=999
--- a/test/e2e/quadlet/volume.container
+++ b/test/e2e/quadlet/volume.container
@@ -1,10 +1,10 @@
 ## assert-podman-args -v /host/dir:/container/volume
 ## assert-podman-args -v /host/dir2:/container/volume2:Z
 ## assert-podman-args -v named:/container/named
-## assert-podman-args -v systemd-quadlet:/container/quadlet imagename
+## assert-podman-args -v systemd-quadlet:/container/quadlet localhost/imagename

 [Container]
-Image=imagename
+Image=localhost/imagename
 Volume=/host/dir:/container/volume
 Volume=/host/dir2:/container/volume2:Z
 Volume=/container/empty
--- a/test/e2e/quadlet_test.go
+++ b/test/e2e/quadlet_test.go
@@ -291,6 +291,7 @@ var _ = Describe("quadlet system generator", func() {
 		Entry("readwrite.container", "readwrite.container"),
 		Entry("readwrite-notmpfs.container", "readwrite-notmpfs.container"),
 		Entry("seccomp.container", "seccomp.container"),
+		Entry("shortname.container", "shortname.container"),
 		Entry("timezone.container", "timezone.container"),
 		Entry("user.container", "user.container"),
 		Entry("user-host.container", "user-host.container"),