github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-01 23:18:41 +00:00
Code Issues Projects Releases Wiki Activity

Update GCP metadata provider

Browse Source 
Signed-off-by: Preston Holmes <preston@ptone.com>
This commit is contained in:
Preston Holmes
2019-05-15 12:58:12 -07:00
parent bdf1d0558f
commit d11404ca97
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/metadata/provider_gcp.go
View File

@@ -53,7 +53,7 @@ func (p *ProviderGCP) Extract() ([]byte, error) {
}
// Generic userdata
userData, err := gcpGet(instance + "attributes/userdata")
userData, err := gcpGet(instance + "attributes/user-data")
if err != nil {
log.Printf("GCP: Failed to get user-data: %s", err)
// This is not an error
@@ -102,8 +102,10 @@ func (p *ProviderGCP) handleSSH() error {
return fmt.Errorf("Failed to get sshKeys: %s", err)
}
if err := os.Mkdir(path.Join(ConfigPath, SSH), 0755); err != nil {
return fmt.Errorf("Failed to create %s: %s", SSH, err)
if _, err := os.Stat(path.Join(ConfigPath, SSH)); os.IsNotExist(err) {
if err := os.Mkdir(path.Join(ConfigPath, SSH), 0755); err != nil {
return fmt.Errorf("Failed to create %s: %s", SSH, err)
}
}
rootKeys := ""