kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10771 from bharath-123/fix/cloud-zones 

Update GCE zones
This commit is contained in:
Kubernetes Prow Robot 2021-02-08 18:16:28 -08:00 committed by GitHub
parent 4507be8e13 e1e02aa761
commit b78d66464a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
upup/pkg/fi/cloud.go
View File

@ -204,11 +204,23 @@ var zonesToCloud = map[string]kops.CloudProviderID{
"asia-east1-c": kops.CloudProviderGCE, "asia-east1-c": kops.CloudProviderGCE,
"asia-east1-d": 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-a": kops.CloudProviderGCE,
"asia-northeast1-b": kops.CloudProviderGCE, "asia-northeast1-b": kops.CloudProviderGCE,
"asia-northeast1-c": kops.CloudProviderGCE, "asia-northeast1-c": kops.CloudProviderGCE,
"asia-northeast1-d": 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-a": kops.CloudProviderGCE,
"asia-south1-b": kops.CloudProviderGCE, "asia-south1-b": kops.CloudProviderGCE,
"asia-south1-c": kops.CloudProviderGCE, "asia-south1-c": kops.CloudProviderGCE,
@ -216,6 +228,10 @@ var zonesToCloud = map[string]kops.CloudProviderID{
"asia-southeast1-a": kops.CloudProviderGCE, "asia-southeast1-a": kops.CloudProviderGCE,
"asia-southeast1-b": 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-a": kops.CloudProviderGCE,
"australia-southeast1-b": kops.CloudProviderGCE, "australia-southeast1-b": kops.CloudProviderGCE,
"australia-southeast1-c": kops.CloudProviderGCE, "australia-southeast1-c": kops.CloudProviderGCE,
@ -242,6 +258,10 @@ var zonesToCloud = map[string]kops.CloudProviderID{
"europe-west4-b": kops.CloudProviderGCE, "europe-west4-b": kops.CloudProviderGCE,
"europe-west4-c": 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-a": kops.CloudProviderGCE,
"us-central1-b": kops.CloudProviderGCE, "us-central1-b": kops.CloudProviderGCE,
"us-central1-c": kops.CloudProviderGCE, "us-central1-c": kops.CloudProviderGCE,
@ -265,6 +285,18 @@ var zonesToCloud = map[string]kops.CloudProviderID{
"us-west1-c": kops.CloudProviderGCE, "us-west1-c": kops.CloudProviderGCE,
"us-west1-d": 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-a": kops.CloudProviderGCE,
"northamerica-northeast1-b": kops.CloudProviderGCE, "northamerica-northeast1-b": kops.CloudProviderGCE,
"northamerica-northeast1-c": kops.CloudProviderGCE, "northamerica-northeast1-c": kops.CloudProviderGCE,

2
upup/pkg/fi/cloudup/new_cluster.go
View File

@ -244,7 +244,7 @@ func NewCluster(opt *NewClusterOptions, clientset simple.Clientset) (*NewCluster
if allZones.Len() == 0 { if allZones.Len() == 0 {
return nil, fmt.Errorf("must specify --zones or --cloud") 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")
} }
} }