Skip to content

Commit

Permalink
UPSTREAM: <carry>: Tolerate node ExternalID changes with no cloud pro…
Browse files Browse the repository at this point in the history
…vider

Previously, if the kubelet tried to register itself with the API server,
and was rejected due to the external ID changing, it would delete the
node object and recreate it.  This commit causes it to tolerate
a change in ExternalID when the ExternalID is not being provided by a
cloud provider, assuming the new ExternalID is either the node's
(metadata) name, or one of node's addresses.
  • Loading branch information
pmorie committed Sep 1, 2016
1 parent 3e90a5b commit 958b522
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 0 deletions.
25 changes: 25 additions & 0 deletions vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 43 additions & 0 deletions vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 958b522

Please sign in to comment.