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

Merge pull request #40597 from wojtek-t/cleanup_get_from_cache

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 40497, 39769, 40554, 40569, 40597)

Minor cleanup in getting from apiserver cache in kubelet
This commit is contained in:
Kubernetes Submit Queue 2017-01-27 17:38:28 -08:00 committed by GitHub
commit a951727a18
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/BUILD
View File

@ -80,6 +80,7 @@ go_library(
"//pkg/kubelet/status:go_default_library", "//pkg/kubelet/status:go_default_library",
"//pkg/kubelet/sysctl:go_default_library", "//pkg/kubelet/sysctl:go_default_library",
"//pkg/kubelet/types: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/format:go_default_library",
"//pkg/kubelet/util/queue:go_default_library", "//pkg/kubelet/util/queue:go_default_library",
"//pkg/kubelet/util/sliceutils:go_default_library", "//pkg/kubelet/util/sliceutils:go_default_library",

3
pkg/kubelet/kubelet_node_status.go
View File

@ -37,6 +37,7 @@ import (
"k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/cloudprovider"
"k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/cadvisor"
"k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/events"
"k8s.io/kubernetes/pkg/kubelet/util"
"k8s.io/kubernetes/pkg/kubelet/util/sliceutils" "k8s.io/kubernetes/pkg/kubelet/util/sliceutils"
nodeutil "k8s.io/kubernetes/pkg/util/node" nodeutil "k8s.io/kubernetes/pkg/util/node"
"k8s.io/kubernetes/pkg/version" "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. // If it result in a conflict, all retries are served directly from etcd.
opts := metav1.GetOptions{} opts := metav1.GetOptions{}
if tryNumber == 0 { if tryNumber == 0 {
opts.ResourceVersion = "0" util.FromApiserverCache(&opts)
} }
node, err := kl.kubeClient.Core().Nodes().Get(string(kl.nodeName), opts) node, err := kl.kubeClient.Core().Nodes().Get(string(kl.nodeName), opts)
if err != nil { if err != nil {