mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Merge pull request #61000 from dims/split-host-name-when-dhcp-domain-is-present-in-host-name
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Split out the hostname when default dhcp_domain is used in nova.conf **What this PR does / why we need it**: When /etc/nova/nova.conf does not have specify dhcp_domain to empty string, a default string of '.novalocal' is returned by the meta data service. So we need to just split the string and pick the first one in the array. ``` $ curl http://169.254.169.254/latest/meta-data/hostname testvm-1.novalocal $ curl http://169.254.169.254/latest/meta-data/public-hostname testvm-1.novalocal $ curl http://169.254.169.254/latest/meta-data/local-hostname testvm-1.novalocal ``` **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
This commit is contained in:
commit
d7ec46c5de
@ -20,6 +20,7 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"github.com/golang/glog"
|
||||
"github.com/gophercloud/gophercloud"
|
||||
@ -60,7 +61,7 @@ func (i *Instances) CurrentNodeName(ctx context.Context, hostname string) (types
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return types.NodeName(md.Hostname), nil
|
||||
return types.NodeName(strings.Split(md.Hostname, ".")[0]), nil
|
||||
}
|
||||
|
||||
// AddSSHKeyToAllInstances is not implemented for OpenStack
|
||||
|
Loading…
Reference in New Issue
Block a user