UPSTREAM: 32000: Update node status instead of node in kubelet #10790
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
LGTM |
liggitt
added
the
approved
|
actually, split the commit into an UPSTREAM and a |
| @@ -1242,7 +1242,7 @@ func (kl *Kubelet) tryRegisterWithApiServer(node *api.Node) bool { | |||
| // controller-managed attach detach annotation for this node. | |||
| requiresUpdate := kl.reconcileCMADAnnotationWithExistingNode(node, existingNode) | |||
| if requiresUpdate { | |||
| if _, err := kl.kubeClient.Core().Nodes().Update(existingNode); err != nil { | |||
| if _, err := kl.kubeClient.Core().Nodes().UpdateStatus(existingNode); err != nil { | |||
There was a problem hiding this comment.
this line needs to go in a commit titled: UPSTREAM: <carry>: Tolerate node ExternalID changes with no cloud provider
pmorie
force-pushed
the
attach-detach-picks
branch
from
7974b4a to
d1bc56c
Compare
|
@liggitt updated |
|
LGTM, [merge] |
|
blocked by #10795 |
|
[merge] |
|
Evaluated for origin merge up to d1bc56c |
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/8693/) (Image: devenv-rhel7_4976) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Needed to avoid changing the permissions of the node role.