Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automated cherry pick of #124516: Fix behavior with external cloud provider and #124556

Open
wants to merge 1 commit into
base: release-1.29
Choose a base branch
from
Open

Automated cherry pick of #124516: Fix behavior with external cloud provider and #124556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkg/kubelet/nodestatus/setters.go
View file
Open in desktop
Expand Up @@ -136,6 +136,9 @@ func NodeAddress(nodeIPs []net.IP, // typically Kubelet.nodeIPs
// in https://github.com/kubernetes/kubernetes/issues/120720.
// We are already hinting the external cloud provider via the annotation AnnotationAlphaProvidedIPAddr.
if !nodeIPSpecified {
node.Status.Addresses = []v1.NodeAddress{
{Type: v1.NodeHostName, Address: hostname},
}
return nil
}
}
Expand Down
12 changes: 8 additions & 4 deletions pkg/kubelet/nodestatus/setters_test.go
View file
Open in desktop
Expand Up @@ -240,15 +240,19 @@ func TestNodeAddress(t *testing.T) {
nodeIP: netutils.ParseIPSloppy("::"),
nodeAddresses: []v1.NodeAddress{},
cloudProviderType: cloudProviderExternal,
expectedAddresses: []v1.NodeAddress{},
shouldError: false,
expectedAddresses: []v1.NodeAddress{
{Type: v1.NodeHostName, Address: testKubeletHostname},
},
shouldError: false,
},
{
name: "cloud provider is external and no nodeIP",
nodeAddresses: []v1.NodeAddress{},
cloudProviderType: cloudProviderExternal,
expectedAddresses: []v1.NodeAddress{},
shouldError: false,
expectedAddresses: []v1.NodeAddress{
{Type: v1.NodeHostName, Address: testKubeletHostname},
},
shouldError: false,
},
{
name: "cloud doesn't report hostname, no override, detected hostname mismatch",
Expand Down