From 8bfb0eb21b3a25dd527a3dc72dc34756ece5e175 Mon Sep 17 00:00:00 2001 From: Raymond Finch Date: Wed, 11 Sep 2019 11:12:48 -0700 Subject: [PATCH 1/2] Fix 'unable to infer CloudProvider from Zones' for us-gov-east-1 --- pkg/model/iam/iam_builder.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/model/iam/iam_builder.go b/pkg/model/iam/iam_builder.go index 89f0ee7be8..f29dbe5091 100644 --- a/pkg/model/iam/iam_builder.go +++ b/pkg/model/iam/iam_builder.go @@ -259,6 +259,8 @@ func (b *PolicyBuilder) IAMPrefix() string { return "arn:aws-cn" case "cn-northwest-1": return "arn:aws-cn" + case "us-gov-east-1": + return "arn:aws-us-gov" case "us-gov-west-1": return "arn:aws-us-gov" default: From daff0995df433efc5cc644feb4507f103c5edcf0 Mon Sep 17 00:00:00 2001 From: Raymond Finch Date: Wed, 11 Sep 2019 11:19:43 -0700 Subject: [PATCH 2/2] Fix 'unable to infer CloudProvider from Zones' for us-gov-east-1 --- upup/pkg/fi/cloud.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/upup/pkg/fi/cloud.go b/upup/pkg/fi/cloud.go index ced44c1ebe..f7a2767900 100644 --- a/upup/pkg/fi/cloud.go +++ b/upup/pkg/fi/cloud.go @@ -162,8 +162,13 @@ var zonesToCloud = map[string]kops.CloudProviderID{ "cn-northwest-1b": 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-1b": kops.CloudProviderAWS, + "us-gov-west-1c": kops.CloudProviderAWS, // GCE "asia-east1-a": kops.CloudProviderGCE,