github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13121 from a-robinson/tags

Browse Source 
Be more lenient when deriving the node tag from a node name on GCE
This commit is contained in:
Nikhil Jindal
2015-08-24 17:54:47 -07:00
parent b52eb159ec 87d86cf7a4
commit c85912eb45
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/cloudprovider/providers/gce/gce.go
View File

@@ -442,10 +442,15 @@ func (gce *GCECloud) EnsureTCPLoadBalancer(name, region string, externalIP net.I
} }
// This is kind of hacky, but the managed instance group adds 4 random chars and a hyphen // This is kind of hacky, but the managed instance group adds 4 random chars and a hyphen
// to the base name. // to the base name. Older naming schemes put a hyphen and an incrementing index after
// the base name. Thus we pull off the characters after the final dash to support both.
func (gce *GCECloud) computeHostTag(host string) string { func (gce *GCECloud) computeHostTag(host string) string {
host = strings.SplitN(host, ".", 2)[0] host = strings.SplitN(host, ".", 2)[0]
return host[:len(host)-5] lastHyphen := strings.LastIndex(host, "-")
if lastHyphen == -1 {
return host
}
return host[:lastHyphen]
} }
// UpdateTCPLoadBalancer is an implementation of TCPLoadBalancer.UpdateTCPLoadBalancer. // UpdateTCPLoadBalancer is an implementation of TCPLoadBalancer.UpdateTCPLoadBalancer.