Skip to content
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.

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

Cherry pick of #6835 onto release-1.12 #6914

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ required = [
# aws-sdk-go is one of our critical dependencies
[[override]]
name = "github.com/aws/aws-sdk-go"
version = "v1.16.11"
version = "v1.19.18"

# We need this for our build
[[override]]
Expand Down
6 changes: 6 additions & 0 deletions upup/pkg/fi/cloud.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,12 @@ var zonesToCloud = map[string]kops.CloudProviderID{
"ap-northeast-2d": kops.CloudProviderAWS,
"ap-northeast-2e": kops.CloudProviderAWS,

"ap-east-1a": kops.CloudProviderAWS,
"ap-east-1b": kops.CloudProviderAWS,
"ap-east-1c": kops.CloudProviderAWS,
"ap-east-1d": kops.CloudProviderAWS,
"ap-east-1e": kops.CloudProviderAWS,

"sa-east-1a": kops.CloudProviderAWS,
"sa-east-1b": kops.CloudProviderAWS,
"sa-east-1c": kops.CloudProviderAWS,
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/aws/aws-sdk-go/NOTICE.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions vendor/github.com/aws/aws-sdk-go/aws/BUILD.bazel

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/aws/aws-sdk-go/aws/client/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions vendor/github.com/aws/aws-sdk-go/aws/client/logger.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions vendor/github.com/aws/aws-sdk-go/aws/context_1_7.go

This file was deleted.

11 changes: 11 additions & 0 deletions vendor/github.com/aws/aws-sdk-go/aws/context_1_9.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions vendor/github.com/aws/aws-sdk-go/aws/context_background_1_7.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions vendor/github.com/aws/aws-sdk-go/aws/context_sleep.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/aws/aws-sdk-go/aws/csm/BUILD.bazel

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading