containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26082 from ygalblum/quadlet-pod-name 

Quadlet - fix pod name to depend on the name of the generate service
This commit is contained in:
openshift-merge-bot[bot] 2025-05-06 19:51:51 +00:00 committed by GitHub
parent a2f486feb3 4f38c2fea2
commit ebbf90decc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/systemd/quadlet/quadlet.go
View File

@ -1482,7 +1482,7 @@ func GetPodResourceName(podUnit *parser.UnitFile) string {
// Derive pod name from unit name (with added prefix), or use user-provided name. // Derive pod name from unit name (with added prefix), or use user-provided name.
podName, ok := podUnit.Lookup(PodGroup, KeyPodName) podName, ok := podUnit.Lookup(PodGroup, KeyPodName)
if !ok || len(podName) == 0 { if !ok || len(podName) == 0 {
podName = removeExtension(podUnit.Filename, "systemd-", "") podName = "systemd-%N"
} }
return podName return podName
} }

8
test/e2e/quadlet/basic.pod
View File

@ -1,9 +1,9 @@
## assert-key-is Unit RequiresMountsFor "%t/containers" ## assert-key-is Unit RequiresMountsFor "%t/containers"
## assert-key-is Service Type forking ## assert-key-is Service Type forking
## assert-key-is Service SyslogIdentifier "%N" ## assert-key-is Service SyslogIdentifier "%N"
## assert-key-is-regex Service ExecStartPre ".*/podman pod create --infra-conmon-pidfile=%t/%N.pid --exit-policy=stop --replace --infra-name systemd-basic-infra --name systemd-basic" ## assert-key-is-regex Service ExecStartPre ".*/podman pod create --infra-conmon-pidfile=%t/%N.pid --exit-policy=stop --replace --infra-name systemd-%N-infra --name systemd-%N"
## assert-key-is-regex Service ExecStart ".*/podman pod start systemd-basic" ## assert-key-is-regex Service ExecStart ".*/podman pod start systemd-%N"
## assert-key-is-regex Service ExecStop ".*/podman pod stop --ignore --time=10 systemd-basic" ## assert-key-is-regex Service ExecStop ".*/podman pod stop --ignore --time=10 systemd-%N"
## assert-key-is-regex Service ExecStopPost ".*/podman pod rm --ignore --force systemd-basic" ## assert-key-is-regex Service ExecStopPost ".*/podman pod rm --ignore --force systemd-%N"
[Pod] [Pod]