From b04af61a4b3f23fcd7782003d1dc01d25266a35b Mon Sep 17 00:00:00 2001 From: srikiz Date: Thu, 14 Jan 2021 23:18:18 +0530 Subject: [PATCH] Add SFO3 region for DO. Also update e2e tests to use the full list of supported zones --- docs/getting_started/digitalocean.md | 2 +- tests/e2e/go.mod | 2 +- tests/e2e/go.sum | 6 ++++-- tests/e2e/kubetest2-kops/do/zones.go | 8 ++++++-- upup/pkg/fi/cloud.go | 1 + 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/docs/getting_started/digitalocean.md b/docs/getting_started/digitalocean.md index 9c57a4ecb1..0455de42ea 100644 --- a/docs/getting_started/digitalocean.md +++ b/docs/getting_started/digitalocean.md @@ -28,7 +28,7 @@ export S3_SECRET_ACCESS_KEY= # where is the Spaces API ## Creating a Single Master Cluster In the following examples, `example.com` should be replaced with the DigitalOcean domain you created when going through the [Requirements](#requirements). -Note that you kOps will only be able to successfully provision clusters in regions that support block storage (AMS3, BLR1, FRA1, LON1, NYC1, NYC3, SFO2, SGP1 and TOR1). +Note that you kOps will only be able to successfully provision clusters in regions that support block storage (AMS3, BLR1, FRA1, LON1, NYC1, NYC3, SFO2, SFO3, SGP1 and TOR1). ```bash # debian (the default) + flannel overlay cluster in tor1 diff --git a/tests/e2e/go.mod b/tests/e2e/go.mod index cd2aa3e05a..234a3b46d6 100644 --- a/tests/e2e/go.mod +++ b/tests/e2e/go.mod @@ -8,5 +8,5 @@ require ( github.com/spf13/pflag v1.0.5 gopkg.in/yaml.v2 v2.3.0 k8s.io/klog/v2 v2.4.0 - sigs.k8s.io/kubetest2 v0.0.0-20210115020551-4275dd0a0d63 + sigs.k8s.io/kubetest2 v0.0.0-20210113222902-7e3048643e9b ) diff --git a/tests/e2e/go.sum b/tests/e2e/go.sum index 423566b362..f3264f0d62 100644 --- a/tests/e2e/go.sum +++ b/tests/e2e/go.sum @@ -1599,8 +1599,10 @@ sigs.k8s.io/boskos v0.0.0-20200526191642-45fc818e2d00/go.mod h1:L1ubP7d1CCMSQSjK sigs.k8s.io/boskos v0.0.0-20200710214748-f5935686c7fc/go.mod h1:ZO5RV+VxJS9mb6DvZ1yAjywoyq/wQ8b0vDoZxcIA5kE= sigs.k8s.io/controller-runtime v0.5.0/go.mod h1:REiJzC7Y00U+2YkMbT8wxgrsX5USpXKGhb2sCtAXiT8= sigs.k8s.io/controller-runtime v0.5.4/go.mod h1:JZUwSMVbxDupo0lTJSSFP5pimEyxGynROImSsqIOx1A= -sigs.k8s.io/kubetest2 v0.0.0-20210115020551-4275dd0a0d63 h1:pHCLLY0QjOp3cBTYCjCQdYfYP8lo+/eSyd3vdWkaQTE= -sigs.k8s.io/kubetest2 v0.0.0-20210115020551-4275dd0a0d63/go.mod h1:XT/MnLvPcrJkJo0+3DGIlXljSZxqvU7HNyXI/ny3Flg= +sigs.k8s.io/kubetest2 v0.0.0-20210106183352-5a41a5dbafe5 h1:j1UdMwMRAvGvHFVoQ7TMrQbZxLnKHQLgTlKLFc6rYi4= +sigs.k8s.io/kubetest2 v0.0.0-20210106183352-5a41a5dbafe5/go.mod h1:XT/MnLvPcrJkJo0+3DGIlXljSZxqvU7HNyXI/ny3Flg= +sigs.k8s.io/kubetest2 v0.0.0-20210113222902-7e3048643e9b h1:MaVhFx7pB77Igvv77MTdGWugKG1qOFCzVlbe3/MWTp4= +sigs.k8s.io/kubetest2 v0.0.0-20210113222902-7e3048643e9b/go.mod h1:XT/MnLvPcrJkJo0+3DGIlXljSZxqvU7HNyXI/ny3Flg= sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= sigs.k8s.io/mdtoc v1.0.1/go.mod h1:COYBtOjsaCg7o7SC4eaLwEXPuVRSuiVuLLRrHd7kShw= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= diff --git a/tests/e2e/kubetest2-kops/do/zones.go b/tests/e2e/kubetest2-kops/do/zones.go index 953b3f4532..46326bff8e 100644 --- a/tests/e2e/kubetest2-kops/do/zones.go +++ b/tests/e2e/kubetest2-kops/do/zones.go @@ -23,11 +23,15 @@ import ( var allZones = []string{ "nyc1", - "nyc2", "nyc3", - "sfo1", + "sfo3", "sfo2", "tor1", + "lon1", + "sgp1", + "blr1", + "sfo2", + "sfo3", } // ErrNoEligibleRegion indicates the requested number of zones is not available in any region diff --git a/upup/pkg/fi/cloud.go b/upup/pkg/fi/cloud.go index cd2dadec59..18e20eb417 100644 --- a/upup/pkg/fi/cloud.go +++ b/upup/pkg/fi/cloud.go @@ -279,6 +279,7 @@ var zonesToCloud = map[string]kops.CloudProviderID{ "sfo1": kops.CloudProviderDO, "sfo2": kops.CloudProviderDO, + "sfo3": kops.CloudProviderDO, "ams2": kops.CloudProviderDO, "ams3": kops.CloudProviderDO,