Merge pull request #40597 from wojtek-t/cleanup_get_from_cache

Automatic merge from submit-queue (batch tested with PRs 40497, 39769, 40554, 40569, 40597) Minor cleanup in getting from apiserver cache in kubelet

Merge pull request #40597 from wojtek-t/cleanup_get_from_cache
a951727a · Kubernetes Submit Queue · GitHub · 5b240515 · 2d0fe164 · a951727a
Commit a951727a authored Jan 27, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 27, 2017
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

BUILD pkg/kubelet/BUILD +1 -0

kubelet_node_status.go pkg/kubelet/kubelet_node_status.go +2 -1

No files found.
--- a/pkg/kubelet/BUILD
+++ b/pkg/kubelet/BUILD
@@ -80,6 +80,7 @@ go_library(
        "//pkg/kubelet/status:go_default_library",
        "//pkg/kubelet/sysctl:go_default_library",
        "//pkg/kubelet/types:go_default_library",
+        "//pkg/kubelet/util:go_default_library",
        "//pkg/kubelet/util/format:go_default_library",
        "//pkg/kubelet/util/queue:go_default_library",
        "//pkg/kubelet/util/sliceutils:go_default_library",

--- a/pkg/kubelet/kubelet_node_status.go
+++ b/pkg/kubelet/kubelet_node_status.go
@@ -37,6 +37,7 @@ import (
 	"k8s.io/kubernetes/pkg/cloudprovider"
 	"k8s.io/kubernetes/pkg/kubelet/cadvisor"
 	"k8s.io/kubernetes/pkg/kubelet/events"
+	"k8s.io/kubernetes/pkg/kubelet/util"
 	"k8s.io/kubernetes/pkg/kubelet/util/sliceutils"
 	nodeutil "k8s.io/kubernetes/pkg/util/node"
 	"k8s.io/kubernetes/pkg/version"
@@ -349,7 +350,7 @@ func (kl *Kubelet) tryUpdateNodeStatus(tryNumber int) error {
 	// If it result in a conflict, all retries are served directly from etcd.
 	opts := metav1.GetOptions{}
 	if tryNumber == 0 {
-		opts.ResourceVersion = "0"
+		util.FromApiserverCache(&opts)
 	}
 	node, err := kl.kubeClient.Core().Nodes().Get(string(kl.nodeName), opts)
 	if err != nil {