Skip to content

Bug 1866299: Forces Tagging Client to us-gov-west-1 Region #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Sep 22, 2020
Merged

Bug 1866299: Forces Tagging Client to us-gov-west-1 Region #460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions pkg/dns/aws/dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,10 @@ const (
// govCloudRoute53Region is the AWS GovCloud region for Route 53. See:
// https://docs.aws.amazon.com/govcloud-us/latest/UserGuide/using-govcloud-endpoints.html
govCloudRoute53Region = "us-gov"
// govCloudRoute53Endpoint is the Route 53 service endpoint used for AWS GovCloud.
govCloudRoute53Endpoint = "https://route53.us-gov.amazonaws.com"
// govCloudTaggingEndpoint is the Group Tagging service endpoint used for AWS GovCloud.
govCloudTaggingEndpoint = "https://tagging.us-gov-west-1.amazonaws.com"
// chinaRoute53Endpoint is the Route 53 service endpoint used for AWS China regions.
chinaRoute53Endpoint = "https://route53.amazonaws.com.cn"
// standardRoute53Endpoint is the standard AWS Route 53 service endpoint.
standardRoute53Endpoint = "https://route53.amazonaws.com"
)

var (
Expand Down Expand Up @@ -176,8 +172,14 @@ func NewProvider(config Config, operatorReleaseVersion string) (*Provider, error
log.Info("using route53 custom endpoint", "url", ep.URL)
case ep.Name == TaggingService:
tagFound = true
tagConfig = tagConfig.WithEndpoint(ep.URL)
log.Info("using group tagging custom endpoint", "url", ep.URL)
url := ep.URL
// route53 for govcloud is based out of us-gov-west-1,
// so the tagging client must match.
if strings.Contains(ep.URL, "us-gov-east-1") {
url = govCloudTaggingEndpoint
}
tagConfig = tagConfig.WithEndpoint(url)
log.Info("using group tagging custom endpoint", "url", url)
case ep.Name == ELBService:
elbFound = true
elbConfig = elbConfig.WithEndpoint(ep.URL)
Expand Down