Skip to content

Bug 2040143: [Alibaba] remove unsupport regions #5572

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
Jan 28, 2022
Merged

Bug 2040143: [Alibaba] remove unsupport regions #5572

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
15 changes: 13 additions & 2 deletions pkg/asset/installconfig/alibabacloud/alibabacloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/AlecAivazis/survey/v2"
"github.com/AlecAivazis/survey/v2/core"
"github.com/pkg/errors"
"k8s.io/apimachinery/pkg/util/sets"

"github.com/openshift/installer/pkg/types/alibabacloud"
)
Expand All @@ -17,6 +18,13 @@ const (
defaultAcceptLanguage = "en-US"
)

var unsupportedRegions = sets.NewString(
// Nanjing is a local cloud
"cn-nanjing",
// Dubai does not support private zone service
"me-east-1",
)

// Platform collects AlibabaCloud-specific configuration.
func Platform() (*alibabacloud.Platform, error) {
client, err := NewClient(defaultRegion)
Expand All @@ -42,9 +50,12 @@ func selectRegion(client *Client) (string, error) {
regions := regionsResponse.Regions.Region

var defaultLongRegion string
longRegions := make([]string, 0, len(regions))
shortRegions := make([]string, 0, len(regions))
longRegions := []string{}
shortRegions := []string{}
for _, location := range regions {
if unsupportedRegions.Has(location.RegionId) {
continue
}
longRegion := fmt.Sprintf("%s (%s)", location.RegionId, location.LocalName)
longRegions = append(longRegions, longRegion)
shortRegions = append(shortRegions, location.RegionId)
Expand Down