From 9d8f1bd900fb2e7e5c4d7969e82d05202a307af5 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 17 Aug 2017 14:43:59 +0100 Subject: [PATCH 1/2] Allow specifying a set of metadata providers run with `cmd: ["metadata", "aws"]` to just check for AWS metadata for example. Signed-off-by: Justin Cormack --- pkg/metadata/main.go | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkg/metadata/main.go b/pkg/metadata/main.go index 09963e517..ccf5e09a1 100644 --- a/pkg/metadata/main.go +++ b/pkg/metadata/main.go @@ -40,12 +40,26 @@ var netProviders []Provider // cdromProviders is a list of Providers offering metadata/userdata data via CDROM var cdromProviders []Provider -func init() { - netProviders = []Provider{NewGCP(), NewVultr(), NewAWS()} - cdromProviders = ListCDROMs() -} - func main() { + providers := []string{"aws", "gcp", "vultr", "cdrom"} + if len(os.Args) > 1 { + providers = os.Args[1:] + } + for _, p := range providers { + switch p { + case "aws": + netProviders = append(netProviders, NewAWS()) + case "gcp": + netProviders = append(netProviders, NewGCP()) + case "vultr": + netProviders = append(netProviders, NewVultr()) + case "cdrom": + cdromProviders = ListCDROMs() + default: + log.Fatalf("Unrecognised metadata provider: %s", p) + } + } + if err := os.MkdirAll(ConfigPath, 0755); err != nil { log.Fatalf("Could not create %s: %s", ConfigPath, err) } From a9bf2a073513a68473fe1cc5bbc46afb0b08adf7 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 17 Aug 2017 15:03:23 +0100 Subject: [PATCH 2/2] Update hashes for metadata Signed-off-by: Justin Cormack --- blueprints/docker-for-mac/base.yml | 2 +- examples/aws.yml | 2 +- examples/gcp.yml | 2 +- examples/vultr.yml | 2 +- projects/etcd/etcd.yml | 2 +- projects/etcd/prom-us-central1-f.yml | 2 +- projects/kubernetes/kube-master.yml | 2 +- projects/kubernetes/kube-node.yml | 2 +- projects/swarmd/swarmd.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 994319038..166e3280f 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -10,7 +10,7 @@ init: onboot: # support metadata for optional config in /var/config - name: metadata - image: linuxkit/metadata:cec86f3e1c260c9eafefa80c262fceb40c182ddf + image: linuxkit/metadata:0c29c3ac1e5d2ee591d9710eca987f7df3fb9ca6 - name: sysctl image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 - name: sysfs diff --git a/examples/aws.yml b/examples/aws.yml index 2ac6aae6e..d2bc5c7a7 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:cec86f3e1c260c9eafefa80c262fceb40c182ddf + image: linuxkit/metadata:0c29c3ac1e5d2ee591d9710eca987f7df3fb9ca6 services: - name: rngd image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e diff --git a/examples/gcp.yml b/examples/gcp.yml index 4b6d430e4..510346574 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:cec86f3e1c260c9eafefa80c262fceb40c182ddf + image: linuxkit/metadata:0c29c3ac1e5d2ee591d9710eca987f7df3fb9ca6 services: - name: getty image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec diff --git a/examples/vultr.yml b/examples/vultr.yml index 977ce2738..f2eb2fd8d 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:cec86f3e1c260c9eafefa80c262fceb40c182ddf + image: linuxkit/metadata:0c29c3ac1e5d2ee591d9710eca987f7df3fb9ca6 services: - name: getty image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 19a2b0fce..5e748dd6d 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -18,7 +18,7 @@ onboot: image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:cec86f3e1c260c9eafefa80c262fceb40c182ddf + image: linuxkit/metadata:0c29c3ac1e5d2ee591d9710eca987f7df3fb9ca6 services: - name: rngd image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e diff --git a/projects/etcd/prom-us-central1-f.yml b/projects/etcd/prom-us-central1-f.yml index 198547dc4..4a7431499 100644 --- a/projects/etcd/prom-us-central1-f.yml +++ b/projects/etcd/prom-us-central1-f.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:cec86f3e1c260c9eafefa80c262fceb40c182ddf + image: linuxkit/metadata:0c29c3ac1e5d2ee591d9710eca987f7df3fb9ca6 services: - name: rngd image: mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9 diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index f0497fce2..b1c45679c 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:cec86f3e1c260c9eafefa80c262fceb40c182ddf + image: linuxkit/metadata:0c29c3ac1e5d2ee591d9710eca987f7df3fb9ca6 - name: format image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 - name: mounts diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 9e529adcc..f2c4e7c32 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:cec86f3e1c260c9eafefa80c262fceb40c182ddf + image: linuxkit/metadata:0c29c3ac1e5d2ee591d9710eca987f7df3fb9ca6 - name: format image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 - name: mounts diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 2611c43ac..9fbfacbd4 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -20,7 +20,7 @@ onboot: image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 command: ["/usr/bin/mountie", "/var/lib/swarmd"] - name: metadata - image: linuxkit/metadata:cec86f3e1c260c9eafefa80c262fceb40c182ddf + image: linuxkit/metadata:0c29c3ac1e5d2ee591d9710eca987f7df3fb9ca6 services: - name: getty image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec