github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 09:39:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3117 from steeve/patch-1

Browse Source 
Change GCP metadata SSH keys URL
This commit is contained in:
Rolf Neugebauer 2018-07-16 20:40:59 +01:00 committed by GitHub
commit 090f461e7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/aws.yml
View File

@ -13,7 +13,7 @@ onboot:
image: linuxkit/dhcpcd:v0.5 image: linuxkit/dhcpcd:v0.5
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata - name: metadata
image: linuxkit/metadata:v0.5 image: linuxkit/metadata:721562e6f3ba9b6c003f9e746ff7ee94796f5251
services: services:
- name: rngd - name: rngd
image: linuxkit/rngd:v0.5 image: linuxkit/rngd:v0.5

2
examples/docker-for-mac.yml
View File

@ -11,7 +11,7 @@ init:
onboot: onboot:
# support metadata for optional config in /run/config # support metadata for optional config in /run/config
- name: metadata - name: metadata
image: linuxkit/metadata:v0.5 image: linuxkit/metadata:721562e6f3ba9b6c003f9e746ff7ee94796f5251
- name: sysctl - name: sysctl
image: linuxkit/sysctl:v0.5 image: linuxkit/sysctl:v0.5
- name: sysfs - name: sysfs

2
examples/gcp.yml
View File

@ -13,7 +13,7 @@ onboot:
image: linuxkit/dhcpcd:v0.5 image: linuxkit/dhcpcd:v0.5
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata - name: metadata
image: linuxkit/metadata:v0.5 image: linuxkit/metadata:721562e6f3ba9b6c003f9e746ff7ee94796f5251
services: services:
- name: getty - name: getty
image: linuxkit/getty:v0.5 image: linuxkit/getty:v0.5

2
examples/openstack.yml
View File

@ -13,7 +13,7 @@ onboot:
image: linuxkit/dhcpcd:v0.5 image: linuxkit/dhcpcd:v0.5
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata - name: metadata
image: linuxkit/metadata:v0.5 image: linuxkit/metadata:721562e6f3ba9b6c003f9e746ff7ee94796f5251
command: ["/usr/bin/metadata", "openstack"] command: ["/usr/bin/metadata", "openstack"]
services: services:
- name: rngd - name: rngd

2
examples/packet.yml
View File

@ -18,7 +18,7 @@ onboot:
image: linuxkit/dhcpcd:v0.5 image: linuxkit/dhcpcd:v0.5
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata - name: metadata
image: linuxkit/metadata:v0.5 image: linuxkit/metadata:721562e6f3ba9b6c003f9e746ff7ee94796f5251
command: ["/usr/bin/metadata", "packet"] command: ["/usr/bin/metadata", "packet"]
services: services:
- name: rngd - name: rngd

2
examples/scaleway.yml
View File

@ -16,7 +16,7 @@ onboot:
image: linuxkit/dhcpcd:v0.5 image: linuxkit/dhcpcd:v0.5
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata - name: metadata
image: linuxkit/metadata:v0.5 image: linuxkit/metadata:721562e6f3ba9b6c003f9e746ff7ee94796f5251
services: services:
- name: getty - name: getty
image: linuxkit/getty:v0.5 image: linuxkit/getty:v0.5

2
examples/vultr.yml
View File

@ -13,7 +13,7 @@ onboot:
image: linuxkit/dhcpcd:v0.5 image: linuxkit/dhcpcd:v0.5
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata - name: metadata
image: linuxkit/metadata:v0.5 image: linuxkit/metadata:721562e6f3ba9b6c003f9e746ff7ee94796f5251
services: services:
- name: getty - name: getty
image: linuxkit/getty:v0.5 image: linuxkit/getty:v0.5

2
pkg/metadata/provider_gcp.go
View File

@ -97,7 +97,7 @@ func gcpGet(url string) ([]byte, error) {
// TODO split them into individual user files and make the ssh // TODO split them into individual user files and make the ssh
// container construct those users // container construct those users
func (p *ProviderGCP) handleSSH() error { func (p *ProviderGCP) handleSSH() error {
sshKeys, err := gcpGet(project + "attributes/sshKeys") sshKeys, err := gcpGet(project + "attributes/ssh-keys")
if err != nil { if err != nil {
return fmt.Errorf("Failed to get sshKeys: %s", err) return fmt.Errorf("Failed to get sshKeys: %s", err)
} }