-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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.
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
fix NPE in blockade #21093
fix NPE in blockade #21093
Conversation
10ce09e
to
5a2a288
Compare
@@ -92,6 +98,12 @@ func TestCalculateBlocks(t *testing.T) { | |||
config []plugins.Blockade | |||
expectedSummary summary | |||
}{ | |||
{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this case NPEs if I revert the patch to blockade.go
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/approve
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: BenTheElder, spiffxp The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Thanks, @BenTheElder! |
This reverts commit 354567c. The NPE in blockade was fixed in kubernetes#21093 and ability to recover from panics in plugins in hook was fixed in kubernetes#21410, so we should be safe to reintroduce this config change again.
I think this is sufficient anyhow, see: #21090 (comment)
We probably should be doing this even if it's not the whole fix, we should check the actual value we want to gate for nil instead of it's source of truth / a proxy value.