Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change how cleanup works for audit container #5491

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −5
Open

change how cleanup works for audit container #5491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion control-plane-operator/controllers/hostedcontrolplane/kas/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,8 +1013,9 @@ set -o nounset
set -o pipefail

function cleanup() {
kill -- -$$
pkill -P $$$
wait
exit
Copy link
Contributor

@Joseph-Goergen Joseph-Goergen Jan 31, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jared-hayes-dev Any particular reason why we explicitly exit here and along the other places?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe the wait below holds while the "background" (the tail) process is running.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • I think it is good practice to be explicit once we handle sigterm for the completion of the script
  • Although that wait does in fact handle that particular case (waiting for the last bg process) I think it is good practice to have a wait after killing all the child processes to ensure all bg processes are cleaned up before exiting.

}
trap cleanup SIGTERM

Expand Down
3 changes: 2 additions & 1 deletion ...ol-plane-operator/controllers/hostedcontrolplane/v2/assets/kube-apiserver/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,9 @@ spec:
set -o pipefail

function cleanup() {
kill -- -$$
pkill -P $$$
wait
exit
}
trap cleanup SIGTERM

Expand Down
3 changes: 2 additions & 1 deletion ...l-plane-operator/controllers/hostedcontrolplane/v2/assets/oauth-openshift/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,9 @@ spec:
set -o pipefail

function cleanup() {
kill -- -$$
pkill -P $$$
wait
exit
}
trap cleanup SIGTERM

Expand Down
3 changes: 2 additions & 1 deletion ...ane-operator/controllers/hostedcontrolplane/v2/assets/openshift-apiserver/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,9 @@ spec:
set -o pipefail

function cleanup() {
kill -- -$$
pkill -P $$$
wait
exit
}
trap cleanup SIGTERM

Expand Down
3 changes: 2 additions & 1 deletion ...erator/controllers/hostedcontrolplane/v2/assets/openshift-oauth-apiserver/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,9 @@ spec:
set -o pipefail

function cleanup() {
kill -- -$$
pkill -P $$$
wait
exit
}
trap cleanup SIGTERM

Expand Down