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

Bugfix: get csinode err overrided by parse err #260

Merged
merged 1 commit into from
Mar 29, 2019
Merged

Bugfix: get csinode err overrided by parse err #260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions pkg/controller/topology.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,9 @@ func getSelectedCSINode(
//
// TODO (#257): Once K8s 1.13 is no longer supported, then this check can be removed
// and we can require that CSINode exists.
nodeVersion, err := version.ParseSemantic(selectedNode.Status.NodeInfo.KubeletVersion)
if err != nil {
return nil, fmt.Errorf("Failed to parse kubelet version from node %q: %v", selectedNode.Name, err)
nodeVersion, parseErr := version.ParseSemantic(selectedNode.Status.NodeInfo.KubeletVersion)
if parseErr != nil {
return nil, fmt.Errorf("Failed to parse kubelet version from node %q: %v", selectedNode.Name, parseErr)
}
if nodeVersion.LessThan(k8sTopologyBetaVersion) {
klog.Warningf("Selected node %q version %q is less than %q, falling back to no topology", selectedNode.Name, nodeVersion, k8sTopologyBetaVersion)
Expand Down