Merge pull request kubernetes-sigs#203 from fredkan/v1.0.3-united-reg…

…ion4 add united regions
joelsmith · Mar 5, 2020 · f542ca9 · f542ca9
2 parents de5730e + 83821fe
commit f542ca9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/pkg/disk/utils.go b/pkg/disk/utils.go
@@ -163,8 +163,10 @@ func updateEcsClent(client *ecs.Client) *ecs.Client {
 // SetEcsEndPoint Set Endpoint for Ecs
 func SetEcsEndPoint(regionID string) {
 	// use unitized region endpoint for blew regions.
-	// total 15 regions
-	unitizedRegions := []string{"cn-hangzhou", "cn-zhangjiakou", "cn-huhehaote", "cn-shenzhen", "ap-southeast-1", "ap-southeast-2", "ap-southeast-3", "ap-southeast-5", "eu-central-1", "us-east-1", "cn-hongkong", "ap-northeast-1", "ap-south-1", "us-west-1", "me-east-1"}
+	// total 18 regions
+	unitizedRegions := []string{"cn-hangzhou", "cn-zhangjiakou", "cn-huhehaote", "cn-shenzhen", "ap-southeast-1", "ap-southeast-2",
+		"ap-southeast-3", "ap-southeast-5", "eu-central-1", "us-east-1", "cn-hongkong", "ap-northeast-1", "ap-south-1",
+		"us-west-1", "me-east-1", "cn-north-2-gov-1", "eu-west-1", "cn-chengdu"}
 	for _, tmpRegion := range unitizedRegions {
 		if regionID == tmpRegion {
 			aliyunep.AddEndpointMapping(regionID, "Ecs", "ecs."+regionID+".aliyuncs.com")

diff --git a/pkg/nas/utils.go b/pkg/nas/utils.go
@@ -250,10 +250,10 @@ func newNasClient(accessKeyID, accessKeySecret, accessToken string) (nasClient *
 // SetNasEndPoint Set Endpoint for Nas
 func SetNasEndPoint(regionID string) {
 	// use unitized region endpoint for blew regions.
-	// total 9 regions
-	unitizedRegions := []string{"cn-hangzhou", "cn-zhangjiakou", "cn-huhehaote", "cn-shenzhen",
-		"ap-southeast-1", "ap-southeast-2", "ap-southeast-5", "eu-central-1", "us-east-1"}
-
+	// total 16 regions
+	unitizedRegions := []string{"cn-hangzhou", "cn-zhangjiakou", "cn-huhehaote", "cn-shenzhen", "ap-southeast-1", "ap-southeast-2",
+		"ap-southeast-3", "ap-southeast-5", "eu-central-1", "us-east-1", "ap-northeast-1", "ap-south-1",
+		"us-west-1", "eu-west-1", "cn-chengdu", "cn-north-2-gov-1"}
 	for _, tmpRegion := range unitizedRegions {
 		if regionID == tmpRegion {
 			aliyunep.AddEndpointMapping(regionID, "Nas", "nas-vpc."+regionID+".aliyuncs.com")