opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 17:16:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20714 from deuill/quadlet-notify-healthy

Browse Source 
quadlet: Support `healthy` for `Notify` directives
This commit is contained in:
openshift-merge-bot[bot]
2023-11-22 15:52:29 +00:00
committed by GitHub
parent b7ca114078 6cb2f9b122
commit 2f160f850f
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/source/markdown/podman-systemd.unit.5.md
View File

@ -496,6 +496,10 @@ starts the child in the container. However, if the container application support
`Notify` to true passes the notification details to the container allowing it to notify `Notify` to true passes the notification details to the container allowing it to notify
of startup on its own. of startup on its own.
In addition, setting `Notify` to `healthy` will postpone startup notifications until such time as
the container is marked healthy, as determined by Podman healthchecks. Note that this requires
setting up a container healthcheck, see the `HealthCmd` option for more.
### `PidsLimit=` ### `PidsLimit=`
Tune the container's pids limit. Tune the container's pids limit.

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

@ -496,10 +496,13 @@ func ConvertContainer(container *parser.UnitFile, names map[string]string, isUse
if serviceType != "oneshot" { if serviceType != "oneshot" {
// If we're not in oneshot mode always use some form of sd-notify, normally via conmon, // If we're not in oneshot mode always use some form of sd-notify, normally via conmon,
// but we also allow passing it to the container by setting Notify=yes // but we also allow passing it to the container by setting Notify=yes
notify := container.LookupBooleanWithDefault(ContainerGroup, KeyNotify, false) notify, ok := container.Lookup(ContainerGroup, KeyNotify)
if notify { switch {
case ok && strings.EqualFold(notify, "healthy"):
podman.add("--sdnotify=healthy")
case container.LookupBooleanWithDefault(ContainerGroup, KeyNotify, false):
podman.add("--sdnotify=container") podman.add("--sdnotify=container")
} else { default:
podman.add("--sdnotify=conmon") podman.add("--sdnotify=conmon")
} }
service.Setv(ServiceGroup, service.Setv(ServiceGroup,

5
test/e2e/quadlet/notify-healthy.container Normal file
View File

@ -0,0 +1,5 @@
## assert-podman-args "--sdnotify=healthy"
[Container]
Image=localhost/imagename
Notify=healthy

1
test/e2e/quadlet_test.go
View File

@ -712,6 +712,7 @@ BOGUS=foo
Entry("network.quadlet.container", "network.quadlet.container", 0, ""), Entry("network.quadlet.container", "network.quadlet.container", 0, ""),
Entry("noimage.container", "noimage.container", 1, "converting \"noimage.container\": no Image or Rootfs key specified"), Entry("noimage.container", "noimage.container", 1, "converting \"noimage.container\": no Image or Rootfs key specified"),
Entry("notify.container", "notify.container", 0, ""), Entry("notify.container", "notify.container", 0, ""),
Entry("notify-healthy.container", "notify-healthy.container", 0, ""),
Entry("oneshot.container", "oneshot.container", 0, ""), Entry("oneshot.container", "oneshot.container", 0, ""),
Entry("other-sections.container", "other-sections.container", 0, ""), Entry("other-sections.container", "other-sections.container", 0, ""),
Entry("podmanargs.container", "podmanargs.container", 0, ""), Entry("podmanargs.container", "podmanargs.container", 0, ""),