mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-02 00:07:50 +00:00
Fix behavior with external cloud provider and --hostname-override
This commit is contained in:
parent
6289589509
commit
30972710bd
@ -135,6 +135,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
|
||||
}
|
||||
}
|
||||
|
@ -238,15 +238,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",
|
||||
|
Loading…
Reference in New Issue
Block a user