Fix AnnotationProvidedIPAddr annotation for externalCloudProvider#50422
Fix AnnotationProvidedIPAddr annotation for externalCloudProvider#50422k8s-github-robot merged 1 commit intokubernetes:masterfrom
Conversation
|
Hi @karataliu. Thanks for your PR. I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with I understand the commands that are listed here. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
thanks for the PR @karataliu I'm assuming you tested it, and everything lworks right. LGTM |
|
@wlan0 Yes, verified from my side. |
|
/ok-to-test |
|
/retest |
|
Can someone help review? This is related to the standalone cloud provider change. |
|
/approve |
|
/sig node |
|
/release-note-none |
|
/retest |
| // 4) Try to get the IP from the network interface used as default gateway | ||
| if kl.nodeIP != nil { | ||
| ipAddr = kl.nodeIP | ||
| node.ObjectMeta.Annotations[kubeletapis.AnnotationProvidedIPAddr] = kl.nodeIP.String() |
There was a problem hiding this comment.
Shouldn't we keep this code anyway?
There was a problem hiding this comment.
ah, nm, I read the docs...
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: brendandburns, dims, karataliu Associated issue: 44258 The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
|
/retest Review the full test history for this PR. |
2 similar comments
|
/retest Review the full test history for this PR. |
|
/retest Review the full test history for this PR. |
|
/test all [submit-queue is verifying that this PR is safe to merge] |
|
Automatic merge from submit-queue (batch tested with PRs 50294, 50422, 51757, 52379, 52014). If you want to cherry-pick this change to another branch, please follow the instructions here.. |
|
@karataliu: The following test failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
What this PR does / why we need it:
In #44258, it introduced
AnnotationProvidedIPAddr. When kubelet has 'node-ip' parameter set, and cloud provider not set, this annotation would be populated, and then will be validated by cloud-controller-manager:https://github.com/kubernetes/kubernetes/pull/44258/files#diff-6b0808bd1afb15f9f77986f4459601c2R465
Later with #47152, externalCloudProvider is checked and func returns before that annotation got set. In this case, that annotation will not get populated.
This fix is to bring that annotation assignment to a proper location.
Please correct me if I have any misunderstanding.
@wlan0 @ublubu
Which issue this PR fixes
Special notes for your reviewer:
Release note: