From 8a3cf01384edd208ae61f7b0628d60ae895a396a Mon Sep 17 00:00:00 2001 From: Bharath Vedartham Date: Tue, 9 Feb 2021 00:17:19 +0530 Subject: [PATCH 1/2] Update GCE zones --- upup/pkg/fi/cloud.go | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/upup/pkg/fi/cloud.go b/upup/pkg/fi/cloud.go index 18e20eb417..446ee6acec 100644 --- a/upup/pkg/fi/cloud.go +++ b/upup/pkg/fi/cloud.go @@ -204,11 +204,23 @@ var zonesToCloud = map[string]kops.CloudProviderID{ "asia-east1-c": kops.CloudProviderGCE, "asia-east1-d": kops.CloudProviderGCE, + "asia-east2-a": kops.CloudProviderGCE, + "asia-east2-b": kops.CloudProviderGCE, + "asia-east2-c": kops.CloudProviderGCE, + "asia-northeast1-a": kops.CloudProviderGCE, "asia-northeast1-b": kops.CloudProviderGCE, "asia-northeast1-c": kops.CloudProviderGCE, "asia-northeast1-d": kops.CloudProviderGCE, + "asia-northeast2-a": kops.CloudProviderGCE, + "asia-northeast2-b": kops.CloudProviderGCE, + "asia-northeast2-c": kops.CloudProviderGCE, + + "asia-northeast3-a": kops.CloudProviderGCE, + "asia-northeast3-b": kops.CloudProviderGCE, + "asia-northeast3-c": kops.CloudProviderGCE, + "asia-south1-a": kops.CloudProviderGCE, "asia-south1-b": kops.CloudProviderGCE, "asia-south1-c": kops.CloudProviderGCE, @@ -216,6 +228,10 @@ var zonesToCloud = map[string]kops.CloudProviderID{ "asia-southeast1-a": kops.CloudProviderGCE, "asia-southeast1-b": kops.CloudProviderGCE, + "asia-southeast2-a": kops.CloudProviderGCE, + "asia-southeast2-b": kops.CloudProviderGCE, + "asia-southeast2-c": kops.CloudProviderGCE, + "australia-southeast1-a": kops.CloudProviderGCE, "australia-southeast1-b": kops.CloudProviderGCE, "australia-southeast1-c": kops.CloudProviderGCE, @@ -242,6 +258,10 @@ var zonesToCloud = map[string]kops.CloudProviderID{ "europe-west4-b": kops.CloudProviderGCE, "europe-west4-c": kops.CloudProviderGCE, + "europe-west6-a": kops.CloudProviderGCE, + "europe-west6-b": kops.CloudProviderGCE, + "europe-west6-c": kops.CloudProviderGCE, + "us-central1-a": kops.CloudProviderGCE, "us-central1-b": kops.CloudProviderGCE, "us-central1-c": kops.CloudProviderGCE, @@ -265,6 +285,18 @@ var zonesToCloud = map[string]kops.CloudProviderID{ "us-west1-c": kops.CloudProviderGCE, "us-west1-d": kops.CloudProviderGCE, + "us-west2-a": kops.CloudProviderGCE, + "us-west2-b": kops.CloudProviderGCE, + "us-west2-c": kops.CloudProviderGCE, + + "us-west3-a": kops.CloudProviderGCE, + "us-west3-b": kops.CloudProviderGCE, + "us-west3-c": kops.CloudProviderGCE, + + "us-west4-a": kops.CloudProviderGCE, + "us-west4-b": kops.CloudProviderGCE, + "us-west4-c": kops.CloudProviderGCE, + "northamerica-northeast1-a": kops.CloudProviderGCE, "northamerica-northeast1-b": kops.CloudProviderGCE, "northamerica-northeast1-c": kops.CloudProviderGCE, From e1e02aa76129b29fd0191d206195b2a00928eca5 Mon Sep 17 00:00:00 2001 From: Bharath Vedartham Date: Tue, 9 Feb 2021 00:24:30 +0530 Subject: [PATCH 2/2] Refactor error message --- upup/pkg/fi/cloudup/new_cluster.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upup/pkg/fi/cloudup/new_cluster.go b/upup/pkg/fi/cloudup/new_cluster.go index 02584feea3..d379c4913c 100644 --- a/upup/pkg/fi/cloudup/new_cluster.go +++ b/upup/pkg/fi/cloudup/new_cluster.go @@ -244,7 +244,7 @@ func NewCluster(opt *NewClusterOptions, clientset simple.Clientset) (*NewCluster if allZones.Len() == 0 { return nil, fmt.Errorf("must specify --zones or --cloud") } - return nil, fmt.Errorf("unable to infer cloud provider from zones (is there a typo in --zones?)") + return nil, fmt.Errorf("unable to infer cloud provider from zones. pass in the cloud provider explicitly using --cloud") } }