Merge pull request #4148 from leeeboo/master

Automatic merge from submit-queue. Add support for cn-northwest-1. Add support for cn-northwest-1. But I am not sure whether the packages under /vender/ are all supported.
kubernetes · Dec 27, 2017 · e324eb7 · e324eb7
2 parents 241d5d0 + c52472c
commit e324eb7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/pkg/model/iam.go b/pkg/model/iam.go
@@ -191,6 +191,8 @@ func (b *IAMModelBuilder) buildAWSIAMRolePolicy() (fi.Resource, error) {
 			switch b.Region {
 			case "cn-north-1":
 				return "ec2.amazonaws.com.cn"
+			case "cn-northwest-1":
+				return "ec2.amazonaws.com.cn"
 			default:
 				return "ec2.amazonaws.com"
 			}

diff --git a/pkg/model/iam/iam_builder.go b/pkg/model/iam/iam_builder.go
@@ -252,6 +252,8 @@ func (b *PolicyBuilder) IAMPrefix() string {
 	switch b.Region {
 	case "cn-north-1":
 		return "arn:aws-cn"
+	case "cn-northwest-1":
+		return "arn:aws-cn"
 	case "us-gov-west-1":
 		return "arn:aws-us-gov"
 	default:

diff --git a/upup/pkg/fi/cloud.go b/upup/pkg/fi/cloud.go
@@ -143,6 +143,9 @@ var zonesToCloud = map[string]kops.CloudProviderID{
 	"cn-north-1a": kops.CloudProviderAWS,
 	"cn-north-1b": kops.CloudProviderAWS,
 
+	"cn-northwest-1a": kops.CloudProviderAWS,
+	"cn-northwest-1b": kops.CloudProviderAWS,
+
 	"us-gov-west-1a": kops.CloudProviderAWS,
 	"us-gov-west-1b": kops.CloudProviderAWS,