kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3809 from rdrgmnzs/hostnameOverride_use_hostname 

Automatic merge from submit-queue.

Let a user set a hostnameOverride when the cloud provider is aws.

Let a user use the hostname or set a hostnameOverride when the cloud provider is aws. This would allow for a more descriptive name to be used. The name of the hosts when using @hostname can be set by using a hook or some other method.
This commit is contained in:
Kubernetes Submit Queue 2017-12-13 17:46:21 -08:00 committed by GitHub
parent db09337e42 255305b8ef
commit ac7ae3fd58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/model/components/kubelet.go
View File

@ -149,8 +149,11 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
} }
// Use the hostname from the AWS metadata service // Use the hostname from the AWS metadata service
// if hostnameOverride is not set.
if clusterSpec.Kubelet.HostnameOverride == "" {
clusterSpec.Kubelet.HostnameOverride = "@aws" clusterSpec.Kubelet.HostnameOverride = "@aws"
} }
}
if cloudProvider == kops.CloudProviderDO { if cloudProvider == kops.CloudProviderDO {
clusterSpec.Kubelet.CloudProvider = "external" clusterSpec.Kubelet.CloudProvider = "external"

2
upup/pkg/fi/nodeup/command.go
View File

@ -308,7 +308,7 @@ func evaluateSpec(c *api.Cluster) error {
} }
func evaluateHostnameOverride(hostnameOverride string) (string, error) { func evaluateHostnameOverride(hostnameOverride string) (string, error) {
if hostnameOverride == "" { if hostnameOverride == "" || hostnameOverride == "@hostname" {
return "", nil return "", nil
} }
k := strings.TrimSpace(hostnameOverride) k := strings.TrimSpace(hostnameOverride)