MachinePools/OpenStack: Fix nil pointer exception#2253
Merged
openshift-merge-bot[bot] merged 2 commits intoopenshift:masterfrom Apr 27, 2024
Merged
MachinePools/OpenStack: Fix nil pointer exception#2253openshift-merge-bot[bot] merged 2 commits intoopenshift:masterfrom
openshift-merge-bot[bot] merged 2 commits intoopenshift:masterfrom
Conversation
openshift-ci
bot
added
the
approved
Member
Author
|
/hold for QE |
openshift-ci
bot
added
the
do-not-merge/hold
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #2253 +/- ##
==========================================
+ Coverage 58.58% 58.72% +0.13%
==========================================
Files 182 182
Lines 25775 25889 +114
==========================================
+ Hits 15101 15204 +103
- Misses 9402 9414 +12
+ Partials 1272 1271 -1 |
...to pick up openshift/installer#8227 which should fix the nil pointer exception described in the referenced card. HIVE-2476
When MachinePool.Spec.Replicas is unset, as it is when we're doing autoscaling, this used to trigger a nil pointer exception in the vendored installer code in the MachineSets function, which used to assume it would never be nil. A prior commit revendored installer to pick up a fix whereby that assumption is no longer relied upon. Add unit testing to prove that it works. HIVE-2476
2uasimojo
force-pushed
the
HIVE-2476/openstack-npe
branch
from
8a5c30b to
f59f327
Compare
2uasimojo
commented
Apr 5, 2024
Comment on lines
+36
to
+43
| // In installer CLI code paths, the replica number is set to 3 by default | ||
| // when install-config does not have any Compute machine-pool, or when the | ||
| // Compute machine-pool does not have the `replicas` property. | ||
| // However, external consumers of this func may not be so kind... | ||
| if pool.Replicas == nil { | ||
| pool.Replicas = ptr.To[int64](0) | ||
| } | ||
|
|
Member
Author
There was a problem hiding this comment.
Reviewer: Upstream fix here 👀
Member
Author
|
security fail to be fixed in #2256 |
Member
Author
|
/test security |
openshift-ci
bot
removed
the
do-not-merge/hold
Contributor
|
/lgtm |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: 2uasimojo, lleshchi The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Contributor
|
@2uasimojo: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
2uasimojo
added a commit
to 2uasimojo/hive
that referenced
this pull request
Apr 30, 2024
This is *not* a cherry-pick of openshift#2253 / (c6b37ee & f59f327). That solution revendored installer to pick up the fix from upstream. In older branches, this would have dragged in too many dependencies, so we instead fix it "locally" with an explicit nil check. Note also that the original fix added unit tests. We can't do that here either because the new tests rely on the OpenStack UT suite being un-broken [1], which again relied on upstream changes [2][3] we can't pull into older branches. [1] openshift#2251 [2] openshift/installer#8187 [3] openshift/installer#8209 HIVE-2476
openshift-cherrypick-robot
pushed a commit
to openshift-cherrypick-robot/hive
that referenced
this pull request
Aug 8, 2024
This is *not* a cherry-pick of openshift#2253 / (c6b37ee & f59f327). That solution revendored installer to pick up the fix from upstream. In older branches, this would have dragged in too many dependencies, so we instead fix it "locally" with an explicit nil check. Note also that the original fix added unit tests. We can't do that here either because the new tests rely on the OpenStack UT suite being un-broken [1], which again relied on upstream changes [2][3] we can't pull into older branches. [1] openshift#2251 [2] openshift/installer#8187 [3] openshift/installer#8209 HIVE-2476
openshift-cherrypick-robot
pushed a commit
to openshift-cherrypick-robot/hive
that referenced
this pull request
Aug 9, 2024
This is *not* a cherry-pick of openshift#2253 / (c6b37ee & f59f327). That solution revendored installer to pick up the fix from upstream. In older branches, this would have dragged in too many dependencies, so we instead fix it "locally" with an explicit nil check. Note also that the original fix added unit tests. We can't do that here either because the new tests rely on the OpenStack UT suite being un-broken [1], which again relied on upstream changes [2][3] we can't pull into older branches. [1] openshift#2251 [2] openshift/installer#8187 [3] openshift/installer#8209 HIVE-2476
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
...when MachinePool.Spec.Replicas is unset, as it is when we're doing autoscaling.
The fix was upstream so this PR just revendors to pick it up, and adds unit tests to prove it works.
HIVE-2476