github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84469 from andrewsykim/cloud-node-controller-error

Browse Source 
improve error handling in cloud node controller
This commit is contained in:
Kubernetes Prow Robot 2019-10-29 02:44:43 -07:00 committed by GitHub
commit 362e17ff9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/cloud/node_controller.go
View File

@ -147,7 +147,7 @@ func (cnc *CloudNodeController) updateNodeAddress(ctx context.Context, node *v1.
nodeAddresses, err := getNodeAddressesByProviderIDOrName(ctx, instances, node)
if err != nil {
klog.Errorf("%v", err)
klog.Errorf("Error getting node addresses for node %q: %v", node.Name, err)
return
}
@ -177,7 +177,7 @@ func (cnc *CloudNodeController) updateNodeAddress(ctx context.Context, node *v1.
// it can be found in the cloud as well (consistent with the behaviour in kubelet)
if nodeIP, ok := ensureNodeProvidedIPExists(node, nodeAddresses); ok {
if nodeIP == nil {
klog.Errorf("Specified Node IP not found in cloudprovider")
klog.Errorf("Specified Node IP not found in cloudprovider for node %q", node.Name)
return
}
}
@ -373,7 +373,7 @@ func getNodeAddressesByProviderIDOrName(ctx context.Context, instances cloudprov
providerIDErr := err
nodeAddresses, err = instances.NodeAddresses(ctx, types.NodeName(node.Name))
if err != nil {
return nil, fmt.Errorf("NodeAddress: Error fetching by providerID: %v Error fetching by NodeName: %v", providerIDErr, err)
return nil, fmt.Errorf("error fetching node by provider ID: %v, and error by node name: %v", providerIDErr, err)
}
}
return nodeAddresses, nil