diff options
| author | Valentin Rothberg <vrothberg@redhat.com> | 2022-08-08 11:44:52 +0200 |
|---|---|---|
| committer | Valentin Rothberg <vrothberg@redhat.com> | 2022-08-10 21:12:39 +0200 |
| commit | 79e21b5b162d3c2d3fb274b20bfe180c15284893 (patch) | |
| tree | b9ff3be91c10b59be5cfe5f7536e8c19d845271b /pkg/specgen/generate | |
| parent | 3fc126e152d5ebe4bfef980dea04192762628773 (diff) | |
| download | podman-79e21b5b162d3c2d3fb274b20bfe180c15284893.tar.gz podman-79e21b5b162d3c2d3fb274b20bfe180c15284893.tar.bz2 podman-79e21b5b162d3c2d3fb274b20bfe180c15284893.zip | |
kube play: sd-notify integration
Integrate sd-notify policies into `kube play`. The policies can be
configured for all contianers via the `io.containers.sdnotify`
annotation or for indidivual containers via the
`io.containers.sdnotify/$name` annotation.
The `kube play` process will wait for all containers to be ready by
waiting for the individual `READY=1` messages which are received via
the `pkg/systemd/notifyproxy` proxy mechanism.
Also update the simple "container" sd-notify test as it did not fully
test the expected behavior which became obvious when adding the new
tests.
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
Diffstat (limited to 'pkg/specgen/generate')
| -rw-r--r-- | pkg/specgen/generate/container_create.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index f4c67e534..e9cec2873 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -353,9 +353,11 @@ func createContainerOptions(rt *libpod.Runtime, s *specgen.SpecGenerator, pod *l } if len(s.SdNotifyMode) > 0 { options = append(options, libpod.WithSdNotifyMode(s.SdNotifyMode)) - } - if notify, ok := os.LookupEnv("NOTIFY_SOCKET"); ok { - options = append(options, libpod.WithSdNotifySocket(notify)) + if s.SdNotifyMode != define.SdNotifyModeIgnore { + if notify, ok := os.LookupEnv("NOTIFY_SOCKET"); ok { + options = append(options, libpod.WithSdNotifySocket(notify)) + } + } } if pod != nil { |