Skip to content

SREP-4577: Fix webhook drain deadlock with preStop hook and failurePolicy: Ignore #717

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

Open
dustman9000 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

SREP-4577: Fix webhook drain deadlock with preStop hook and failurePolicy: Ignore #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4588aea
Add preStop hook to webhook pod to prevent drain deadlock
dustman9000 Apr 18, 2026
0ac2115
Change webhook failurePolicy to Ignore to prevent drain deadlock
dustman9000 Apr 18, 2026
3d968da
Add justification comments for failurePolicy: Ignore
dustman9000 Apr 19, 2026
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
2 changes: 1 addition & 1 deletion bundle/manifests/addon-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ spec:
- v1
containerPort: 443
deploymentName: addon-operator-webhooks
failurePolicy: Fail
failurePolicy: Ignore
generateName: vaddons.managed.openshift.io
rules:
- apiGroups:
Expand Down
4 changes: 3 additions & 1 deletion config/templates/csv-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ spec:
- v1
containerPort: 443
deploymentName: addon-operator-webhooks
failurePolicy: Fail
# Ignore so webhook unavailability during node drains does not block MCO.
# Compensating controls: 2 replicas with pod anti-affinity, preStop hook.
failurePolicy: Ignore
Comment thread
coderabbitai[bot] marked this conversation as resolved.
generateName: vaddons.managed.openshift.io
rules:
- apiGroups:
Expand Down
4 changes: 3 additions & 1 deletion deploy-extras/development/webhook/validatingwebhookconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ webhooks:
name: webhook-service
namespace: openshift-addon-operator
path: /validate-addon
failurePolicy: Fail
# Ignore so webhook unavailability during node drains does not block MCO.
# Compensating controls: 2 replicas with pod anti-affinity, preStop hook.
failurePolicy: Ignore
name: vaddons.managed.openshift.io
rules:
- apiGroups:
Expand Down
4 changes: 4 additions & 0 deletions deploy/70_webhook-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ spec:
containers:
- name: webhook
image: quay.io/openshift/addon-operator-webhook:latest
lifecycle:
preStop:
exec:
command: ["sleep", "5"]
ports:
- containerPort: 8080
livenessProbe:
Expand Down
4 changes: 3 additions & 1 deletion deploy_pko/ValidatingWebhookConfiguration-addons.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ webhooks:
name: addon-operator-webhook
namespace: openshift-addon-operator
path: /validate-addon
failurePolicy: Fail
# Ignore so webhook unavailability during node drains does not block MCO.
# Compensating controls: 2 replicas with pod anti-affinity, preStop hook.
failurePolicy: Ignore
name: vaddons.managed.openshift.io
rules:
- apiGroups:
Expand Down
4 changes: 3 additions & 1 deletion hack/webhookdefinition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
- v1
containerPort: 443
deploymentName: addon-operator-webhooks
failurePolicy: Fail
# Ignore so webhook unavailability during node drains does not block MCO.
# Compensating controls: 2 replicas with pod anti-affinity, preStop hook.
failurePolicy: Ignore
generateName: vaddons.managed.openshift.io
rules:
- apiGroups:
Expand Down