github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 15:13:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9728 from justinsb/aws_id_as_name

Browse Source 
Allow nodename to be != hostname, use AWS instance ID on AWS
This commit is contained in:
Satnam Singh
2015-06-18 10:17:39 -07:00
parent 1ba909098e 77e1bd3f56
commit 790ca2344f
17 changed files with 166 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -483,6 +483,11 @@ func (gce *GCECloud) getInstanceByName(name string) (*compute.Instance, error) {
return res, nil
}
// Implementation of Instances.CurrentNodeName
func (gce *GCECloud) CurrentNodeName(hostname string) (string, error) {
return hostname, nil
}
func (gce *GCECloud) AddSSHKeyToAllInstances(user string, keyData []byte) error {
return wait.Poll(2*time.Second, 30*time.Second, func() (bool, error) {
project, err := gce.service.Projects.Get(gce.projectID).Do()