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

Merge pull request #7565 from ibrf/master 

Fix kops for us-gov-east-1 #7564
This commit is contained in:
Kubernetes Prow Robot 2019-09-13 08:36:29 -07:00 committed by GitHub
parent 7da0d1a2dc daff0995df
commit a48662aa2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/model/iam/iam_builder.go
View File

@ -259,6 +259,8 @@ func (b *PolicyBuilder) IAMPrefix() string {
return "arn:aws-cn" return "arn:aws-cn"
case "cn-northwest-1": case "cn-northwest-1":
return "arn:aws-cn" return "arn:aws-cn"
case "us-gov-east-1":
return "arn:aws-us-gov"
case "us-gov-west-1": case "us-gov-west-1":
return "arn:aws-us-gov" return "arn:aws-us-gov"
default: default:

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

@ -162,8 +162,13 @@ var zonesToCloud = map[string]kops.CloudProviderID{
"cn-northwest-1b": kops.CloudProviderAWS, "cn-northwest-1b": kops.CloudProviderAWS,
"cn-northwest-1c": kops.CloudProviderAWS, "cn-northwest-1c": kops.CloudProviderAWS,
"us-gov-east-1a": kops.CloudProviderAWS,
"us-gov-east-1b": kops.CloudProviderAWS,
"us-gov-east-1c": kops.CloudProviderAWS,
"us-gov-west-1a": kops.CloudProviderAWS, "us-gov-west-1a": kops.CloudProviderAWS,
"us-gov-west-1b": kops.CloudProviderAWS, "us-gov-west-1b": kops.CloudProviderAWS,
"us-gov-west-1c": kops.CloudProviderAWS,
// GCE // GCE
"asia-east1-a": kops.CloudProviderGCE, "asia-east1-a": kops.CloudProviderGCE,