From f966dea6ff45696d20052afe1716087688753026 Mon Sep 17 00:00:00 2001 From: Sachi King Date: Mon, 22 Jul 2019 17:03:33 +1000 Subject: [PATCH 1/2] metadata: Fix Vultr provider SSH pubkey fetching The Vultr provider currently never calls handleSSH, resulting in it being impossible to bring up a LinuxKit image in vultr with the SSH pubkey provided via the Vultr metadata API. Signed-off-by: Sachi King --- pkg/metadata/provider_vultr.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/metadata/provider_vultr.go b/pkg/metadata/provider_vultr.go index 4a761a63d..5e9704c9d 100644 --- a/pkg/metadata/provider_vultr.go +++ b/pkg/metadata/provider_vultr.go @@ -61,6 +61,11 @@ func (p *ProviderVultr) Extract() ([]byte, error) { // instance-id vultrMetaGet("instanceid", "instance_id", 0644) + // ssh + if err := p.handleSSH(); err != nil { + log.Printf("Vultr: Failed to get ssh data: %s", err) + } + return nil, nil } From d4c6c5be475a55211b4d037c8141dd389205084b Mon Sep 17 00:00:00 2001 From: Sachi King Date: Mon, 22 Jul 2019 17:26:51 +1000 Subject: [PATCH 2/2] Explicitly define metadata provider for Vultr Vultr provides an API that looks a lot like the AWS api, resulting in the AWS provider succeeding, but missing certain metadata parts that one would expect to work out of the box on Vultr, such as SSH PubKey fetching. Signed-off-by: Sachi King --- examples/vultr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/vultr.yml b/examples/vultr.yml index e5ad0e4bd..bd461a97a 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -14,6 +14,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata image: linuxkit/metadata:v0.7 + command: ["/usr/bin/metadata", "vultr"] services: - name: getty image: linuxkit/getty:v0.7