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

move makeHostUrl to gce_instances (only used there)

Browse Source
This commit is contained in:
Ashley Gau
2018-02-06 10:49:08 -08:00
parent 2d5d301669
commit 41318d7596
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/cloudprovider/providers/gce/gce_instances.go
View File

@@ -67,6 +67,11 @@ func getZone(n *v1.Node) string {
return zone return zone
} }
func makeHostURL(projectsApiEndpoint, projectID, zone, host string) string {
host = canonicalizeInstanceName(host)
return projectsApiEndpoint + strings.Join([]string{projectID, "zones", zone, "instances", host}, "/")
}
// ToInstanceReferences returns instance references by links // ToInstanceReferences returns instance references by links
func (gce *GCECloud) ToInstanceReferences(zone string, instanceNames []string) (refs []*compute.InstanceReference) { func (gce *GCECloud) ToInstanceReferences(zone string, instanceNames []string) (refs []*compute.InstanceReference) {
for _, ins := range instanceNames { for _, ins := range instanceNames {

5
pkg/cloudprovider/providers/gce/gce_loadbalancer_external.go
View File

@@ -732,11 +732,6 @@ func nodeNames(nodes []*v1.Node) []string {
return ret return ret
} }
func makeHostURL(projectsApiEndpoint, projectID, zone, host string) string {
host = canonicalizeInstanceName(host)
return projectsApiEndpoint + strings.Join([]string{projectID, "zones", zone, "instances", host}, "/")
}
func hostURLToComparablePath(hostURL string) string { func hostURLToComparablePath(hostURL string) string {
idx := strings.Index(hostURL, "/zones/") idx := strings.Index(hostURL, "/zones/")
if idx < 0 { if idx < 0 {