From 7393a27a111ab788be13b275427fb8de0e1378e2 Mon Sep 17 00:00:00 2001 From: paurosello Date: Thu, 11 Jul 2024 12:10:33 +0200 Subject: [PATCH] Fix China bucket name (#313) * irsafixchina * Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ pkg/key/key.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7380a19..e55741ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed + +- IRSA bucket versioning on CAPA is "v3" + ## [0.26.0] - 2024-07-09 ### Changed diff --git a/pkg/key/key.go b/pkg/key/key.go index 2f001aad..a1d55de3 100644 --- a/pkg/key/key.go +++ b/pkg/key/key.go @@ -112,7 +112,7 @@ func IsBastionAWSMachineTemplate(labels map[string]string) bool { func IRSADomain(baseDomain string, region string, awsAccount string, clusterName string) string { if IsChinaRegion(region) { - return fmt.Sprintf("s3.%s.amazonaws.com.cn/%s-g8s-%s-oidc-pod-identity-v2", region, awsAccount, clusterName) + return fmt.Sprintf("s3.%s.amazonaws.com.cn/%s-g8s-%s-oidc-pod-identity-v3", region, awsAccount, clusterName) } else { return fmt.Sprintf("irsa.%s", baseDomain) }