Fix behavior with external cloud provider and --hostname-override#124516
Merged
k8s-ci-robot merged 1 commit intoApr 25, 2024
Conversation
Member
|
go fmt error is legit the other is a flake |
Member
Contributor
|
/lgtm thx for the fix! |
Contributor
|
LGTM label has been added. DetailsGit tree hash: f6c3d6628a3b284b714b57ebdcf6bb3834b5f083 |
4da16d5 to
3097271
Compare
Member
|
/lgtm /assign @thockin |
Contributor
|
LGTM label has been added. DetailsGit tree hash: 0a9d24050e41a910a50ea9c8a399efee61fc195c |
Contributor
|
/triage accepted |
mrunalp
approved these changes
Apr 25, 2024
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: aojea, danwinship, mrunalp The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
This was referenced Apr 26, 2024
This was referenced Jun 12, 2024
This was referenced Jun 30, 2024
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
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.
What type of PR is this?
/kind bug
/kind regression
What this PR does / why we need it:
#121028 changed kubelet startup to not try to autodetect the node IP when using an external cloud provider, but accidentally also changed it to not write out the kubelet-provided hostname value.
Pre-121028, the
if !nodeIPSpecified { return nil }wasn't there, so it ended up adding an autodetected node IP and the hostname below (whether that hostname was autodetected or overridden). This patch just revises that so we always add the hostname like before, we just don't write out the nodeIP if it wasn't user-specified.(The 2 unit tests that this changes the behavior of are the 2 that were added in #121028.)
Which issue(s) this PR fixes:
Fixes #124453
Special notes for your reviewer:
The logic here can be simplified once we drop the legacy cloud provider case, but (a) I wasn't sure what that was waiting for, and (b) this patch needs to be backported anyway.
Does this PR introduce a user-facing change?
/cc @aojea