github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #83931 from cheftako/context2

Browse Source 
This adds context from for cloud calls for Kubelet.
This commit is contained in:
Kubernetes Prow Robot 2019-10-23 06:44:21 -07:00 committed by GitHub
commit 41a4133318
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/kubelet_getters.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package kubelet package kubelet
import ( import (
"context"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net" "net"
@ -225,7 +226,7 @@ func (kl *Kubelet) getRuntime() kubecontainer.Runtime {
// GetNode returns the node info for the configured node name of this Kubelet. // GetNode returns the node info for the configured node name of this Kubelet.
func (kl *Kubelet) GetNode() (*v1.Node, error) { func (kl *Kubelet) GetNode() (*v1.Node, error) {
if kl.kubeClient == nil { if kl.kubeClient == nil {
return kl.initialNode() return kl.initialNode(context.TODO())
} }
return kl.nodeInfo.GetNodeInfo(string(kl.nodeName)) return kl.nodeInfo.GetNodeInfo(string(kl.nodeName))
} }
@ -241,7 +242,7 @@ func (kl *Kubelet) getNodeAnyWay() (*v1.Node, error) {
return n, nil return n, nil
} }
} }
return kl.initialNode() return kl.initialNode(context.TODO())
} }
// GetNodeConfig returns the container manager node config. // GetNodeConfig returns the container manager node config.

10
pkg/kubelet/kubelet_node_status.go
View File

@ -63,7 +63,7 @@ func (kl *Kubelet) registerWithAPIServer() {
step = 7 * time.Second step = 7 * time.Second
} }
node, err := kl.initialNode() node, err := kl.initialNode(context.TODO())
if err != nil { if err != nil {
klog.Errorf("Unable to construct v1.Node object for kubelet: %v", err) klog.Errorf("Unable to construct v1.Node object for kubelet: %v", err)
continue continue
@ -214,7 +214,7 @@ func (kl *Kubelet) reconcileCMADAnnotationWithExistingNode(node, existingNode *v
// initialNode constructs the initial v1.Node for this Kubelet, incorporating node // initialNode constructs the initial v1.Node for this Kubelet, incorporating node
// labels, information from the cloud provider, and Kubelet configuration. // labels, information from the cloud provider, and Kubelet configuration.
func (kl *Kubelet) initialNode() (*v1.Node, error) { func (kl *Kubelet) initialNode(ctx context.Context) (*v1.Node, error) {
node := &v1.Node{ node := &v1.Node{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: string(kl.nodeName), Name: string(kl.nodeName),
@ -318,13 +318,13 @@ func (kl *Kubelet) initialNode() (*v1.Node, error) {
// local metadata server here. // local metadata server here.
var err error var err error
if node.Spec.ProviderID == "" { if node.Spec.ProviderID == "" {
node.Spec.ProviderID, err = cloudprovider.GetInstanceProviderID(context.TODO(), kl.cloud, kl.nodeName) node.Spec.ProviderID, err = cloudprovider.GetInstanceProviderID(ctx, kl.cloud, kl.nodeName)
if err != nil { if err != nil {
return nil, err return nil, err
} }
} }
instanceType, err := instances.InstanceType(context.TODO(), kl.nodeName) instanceType, err := instances.InstanceType(ctx, kl.nodeName)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -335,7 +335,7 @@ func (kl *Kubelet) initialNode() (*v1.Node, error) {
// If the cloud has zone information, label the node with the zone information // If the cloud has zone information, label the node with the zone information
zones, ok := kl.cloud.Zones() zones, ok := kl.cloud.Zones()
if ok { if ok {
zone, err := zones.GetZone(context.TODO()) zone, err := zones.GetZone(ctx)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get zone from cloud provider: %v", err) return nil, fmt.Errorf("failed to get zone from cloud provider: %v", err)
} }