Fix error handling issue in kubeadm upgrade diff #80648
Merged
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
The error was unintentionally set inside the scope of the if statement, hiding possible errors.
k8s-ci-robot
added
release-note
odinuge
commented
Jul 26, 2019
| @@ -86,7 +87,8 @@ func runDiff(flags *diffFlags, args []string) error { | |||
| if flags.cfgPath != "" { | |||
| cfg, err = configutil.LoadInitConfigurationFromFile(flags.cfgPath) | |||
| } else { | |||
| client, err := kubeconfigutil.ClientSetFromFile(flags.kubeConfigPath) | |||
| var client *client.Clientset | |||
| client, err = kubeconfigutil.ClientSetFromFile(flags.kubeConfigPath) | |||
There was a problem hiding this comment.
For reference, this is not the error I am talking about (this is just where the new err is/was declared). The error not previously handled is the one on line 95 https://github.com/kubernetes/kubernetes/pull/80648/files#diff-a6dcbd409dc17bd39fbe918f4bf5ee5fR95
|
/cc neolit123 |
|
/retest |
1 similar comment
|
/retest |
neolit123
reviewed
Jul 26, 2019
k8s-ci-robot
added
priority/backlog
|
thanks @odinuge |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: neolit123, odinuge 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
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.
What type of PR is this?
/kind bug
What this PR does / why we need it:
This fixes possible null pointer panic if an error is returned, but not checked. This was introduced in #80025, so the code is only in the master branch (and
v1.16.0-alpha.1).The error was unintentionally set inside the scope of the if statement,
hiding possible errors.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
/sig cluster-lifecycle
Does this PR introduce a user-facing change?:
Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.: