From eee4b41d48fed3f84f25626eba1ea83c11424f56 Mon Sep 17 00:00:00 2001 From: Artiom Diomin Date: Fri, 21 Aug 2020 12:00:09 +0300 Subject: [PATCH 1/3] Add cloudConfig to generated config examples Signed-off-by: Artiom Diomin --- pkg/cmd/config.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/cmd/config.go b/pkg/cmd/config.go index 5e30bca59..7d7104250 100644 --- a/pkg/cmd/config.go +++ b/pkg/cmd/config.go @@ -234,6 +234,10 @@ func runPrint(printOptions *printOpts) error { printOptions.CloudProviderExternal = true case "openstack": printOptions.CloudProviderCloudCfg = "<< cloudConfig is required for OpenStack >>" + case "vsphere": + printOptions.CloudProviderCloudCfg = "<< cloudConfig is required for vSphere >>" + case "azure": + printOptions.CloudProviderCloudCfg = "<< cloudConfig is required for Azure >>" } tmpl, err := template.New("example-manifest").Parse(exampleManifest) @@ -288,6 +292,7 @@ func createAndPrintManifest(printOptions *printOpts) error { cfg.Set(yamled.Path{"cloudProvider", "aws"}, providerVal) case "azure": cfg.Set(yamled.Path{"cloudProvider", "azure"}, providerVal) + cfg.Set(yamled.Path{"cloudProvider", "cloudConfig"}, "<< cloudConfig is required for Azure >>\n") case "digitalocean": cfg.Set(yamled.Path{"cloudProvider", "digitalocean"}, providerVal) cfg.Set(yamled.Path{"cloudProvider", "external"}, true) @@ -298,12 +303,13 @@ func createAndPrintManifest(printOptions *printOpts) error { cfg.Set(yamled.Path{"cloudProvider", "external"}, true) case "openstack": cfg.Set(yamled.Path{"cloudProvider", "openstack"}, providerVal) - cfg.Set(yamled.Path{"cloudProvider", "cloudConfig"}, "<< cloudConfig is required for OpenStack >>") + cfg.Set(yamled.Path{"cloudProvider", "cloudConfig"}, "<< cloudConfig is required for OpenStack >>\n") case "packet": cfg.Set(yamled.Path{"cloudProvider", "packet"}, providerVal) cfg.Set(yamled.Path{"cloudProvider", "external"}, true) case "vsphere": cfg.Set(yamled.Path{"cloudProvider", "vsphere"}, providerVal) + cfg.Set(yamled.Path{"cloudProvider", "cloudConfig"}, "<< cloudConfig is required for vSphere >>\n") case "none": cfg.Set(yamled.Path{"cloudProvider", "none"}, providerVal) } From 515b7d9f4c744a644629e1cd458426ce41685c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Sat, 22 Aug 2020 13:12:30 +0200 Subject: [PATCH 2/3] Add new line to cloudConfig field for the full config --- pkg/cmd/config.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/cmd/config.go b/pkg/cmd/config.go index 7d7104250..79e4a98d2 100644 --- a/pkg/cmd/config.go +++ b/pkg/cmd/config.go @@ -233,11 +233,11 @@ func runPrint(printOptions *printOpts) error { case "digitalocean", "packet", "hetzner": printOptions.CloudProviderExternal = true case "openstack": - printOptions.CloudProviderCloudCfg = "<< cloudConfig is required for OpenStack >>" + printOptions.CloudProviderCloudCfg = "<< cloudConfig is required for OpenStack >>\n" case "vsphere": - printOptions.CloudProviderCloudCfg = "<< cloudConfig is required for vSphere >>" + printOptions.CloudProviderCloudCfg = "<< cloudConfig is required for vSphere >>\n" case "azure": - printOptions.CloudProviderCloudCfg = "<< cloudConfig is required for Azure >>" + printOptions.CloudProviderCloudCfg = "<< cloudConfig is required for Azure >>\n" } tmpl, err := template.New("example-manifest").Parse(exampleManifest) From 79ccde212b0e7b5db5c82ae6cb3d6fe818c074f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Sat, 22 Aug 2020 13:15:48 +0200 Subject: [PATCH 3/3] REVERT: Add new line to cloudConfig field for the full config --- pkg/cmd/config.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/cmd/config.go b/pkg/cmd/config.go index 79e4a98d2..7d7104250 100644 --- a/pkg/cmd/config.go +++ b/pkg/cmd/config.go @@ -233,11 +233,11 @@ func runPrint(printOptions *printOpts) error { case "digitalocean", "packet", "hetzner": printOptions.CloudProviderExternal = true case "openstack": - printOptions.CloudProviderCloudCfg = "<< cloudConfig is required for OpenStack >>\n" + printOptions.CloudProviderCloudCfg = "<< cloudConfig is required for OpenStack >>" case "vsphere": - printOptions.CloudProviderCloudCfg = "<< cloudConfig is required for vSphere >>\n" + printOptions.CloudProviderCloudCfg = "<< cloudConfig is required for vSphere >>" case "azure": - printOptions.CloudProviderCloudCfg = "<< cloudConfig is required for Azure >>\n" + printOptions.CloudProviderCloudCfg = "<< cloudConfig is required for Azure >>" } tmpl, err := template.New("example-manifest").Parse(exampleManifest)