[release-1.4] š controlplane: prevent nil pointer exception in kcp controller when inā¦ #8991
Conversation
This file contains 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
k8s-ci-robot
added
the
cncf-cla: yes
k8s-ci-robot
added
the
size/M
vincepri
reviewed
Jul 11, 2023
ā¦framachine does not exist for machine
chrischdi
force-pushed
the
pr-capkcp-nil-fix
branch
from
4055700
to
4253ac6
Compare
|
Adjusted the existing test to also catch this case. |
|
Also created a PR for main which adds the same test: #8992 |
k8s-ci-robot
added
the
lgtm
|
LGTM label has been added. Git tree hash: 1a31b4cd1412baf7c56c9ca88d9968098e91cb6f
|
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: vincepri 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 |
k8s-ci-robot
added
the
approved
|
/area provider/control-plane-kubeadm |
k8s-ci-robot
added
the
area/provider/control-plane-kubeadm
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
ā¦framachine does not exist for machine
What this PR does / why we need it:
This is a manual cherry-pick of changes which are already on main via https://github.com/kubernetes-sigs/cluster-api/pull/8940/files#diff-47cf5969a7a97b70232c5d97b882424745bd1ed511b29aa56f55194688ab833cR631-R634
It fixes a nil pointer by checking if the infraObject is nil.
This could maybe happen e.g. when the InfraMachine has a
DeletionTimestamp.Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged):Fixes #8989
The bug was introduced via the label propagation changes for v1.4, so previous versions should not be affected.
Also this is already fixed on main. This change is a manual cherry-pick of the related changes.