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

fix: check for nil pointer dereference #1763

Merged
merged 5 commits into from
Oct 23, 2024
Merged

fix: check for nil pointer dereference #1763

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2d8740b
fix: check for nil pointer dereference
rschalo Oct 21, 2024
6a93ddd
update if check
rschalo Oct 21, 2024
b41adb1
Merge branch 'main' into fix-filter-instance-types-in-disruption
rschalo Oct 21, 2024
653d7f9
add nil
rschalo Oct 21, 2024
d6dfcd2
Merge branch 'main' into fix-filter-instance-types-in-disruption
rschalo Oct 21, 2024
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
5 changes: 4 additions & 1 deletion pkg/controllers/disruption/multinodeconsolidation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,10 @@ func filterOutSameType(newNodeClaim *scheduling.NodeClaim, consolidate []*Candid
}
// swallow the error since we don't allow min values to impact reschedulability in multi node claim
newNodeClaim, err := newNodeClaim.RemoveInstanceTypeOptionsByPriceAndMinValues(newNodeClaim.Requirements, maxPrice)
return newNodeClaim.InstanceTypeOptions, err
if err != nil {
return nil, err
}
return newNodeClaim.InstanceTypeOptions, nil
}

func (m *MultiNodeConsolidation) Reason() v1.DisruptionReason {
Expand Down
Loading