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.

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

🐛 KCP: fix NPE if ClusterConfiguration is nil #2641

Merged
merged 1 commit into from
Mar 11, 2020

Conversation

ncdc
Copy link
Contributor

@ncdc ncdc commented Mar 11, 2020

What this PR does / why we need it:
When checking if we need to upgrade etcd, guard against an NPE by
checking that KCP.Spec.KubeadmConfigSpec.ClusterConfiguration is not
nil.

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 #2633

Verified

This commit was signed with the committer’s verified signature.
ncdc Andy Goldstein
When checking if we need to upgrade etcd, guard against an NPE by
checking that KCP.Spec.KubeadmConfigSpec.ClusterConfiguration is not
nil.

Signed-off-by: Andy Goldstein <goldsteina@vmware.com>
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 11, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ncdc

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 11, 2020
@ncdc ncdc added this to the v0.3.1 milestone Mar 11, 2020
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/milestone v0.3.1

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 11, 2020
@detiber
Copy link
Member

detiber commented Mar 11, 2020

lgtm as well

@k8s-ci-robot k8s-ci-robot merged commit 5c279e1 into kubernetes-sigs:master Mar 11, 2020
@ncdc ncdc deleted the fix-kcp-upgrade-npe branch October 1, 2020 15:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrading Control Plane fails due to invalid memory address
4 participants