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

kube play: set service container as main PID when possible

Browse Source 
Commit 4fa307f14923 fixed a number of issues in the sdnotify proxies.
Whenever a container runs with a custom sdnotify policy, the proxies
need to keep running which in turn required Podman to run and wait for
the service container to stop.  Improve on that behavior and set the
service container as the main PID (instead of Podman) when no container
needs sdnotify.

Fixes: #17345
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
This commit is contained in:
Valentin Rothberg
2023-02-10 11:33:09 +01:00
parent 15caef98f3
commit 1541ce56cf
4 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/system/260-sdnotify.bats
View File

@ -218,8 +218,14 @@ EOF
_start_socat
wait_for_file $_SOCAT_LOG
# Will run until all containers have stopped.
run_podman play kube --service-container=true --log-driver journald $yaml_source
# The service container is the main PID since no container has a custom
# sdnotify policy.
run_podman container inspect $service_container --format "{{.State.ConmonPid}}"
main_pid="$output"
# Will run until all containers have stopped.
run_podman container wait $service_container test_pod-test
# Make sure the containers have the correct policy.
@ -233,7 +239,7 @@ ignore"
echo "$output"
# The "with policies" test below checks the MAINPID.
is "$output" "MAINPID=.*
is "$output" "MAINPID=$main_pid
READY=1" "sdnotify sent MAINPID and READY"
_stop_socat