storytold/irsa-manager
2
0
Fork 0
mirror of https://github.com/storytold/irsa-manager.git synced 2026-10-09 00:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: #2 us-east-1 support

Browse Source
This commit is contained in:
kkb0318
2024-08-25 12:33:10 +09:00
committed by Brian Ristuccia
parent 3b9e63251b
commit bdb64afe5c
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/aws/aws.go
+10 -2
View File
@@ -122,12 +122,20 @@ func (a *AwsS3Client) PutObjectPublic(ctx context.Context, input ObjectInput) er
func (a *AwsS3Client) CreateBucketPublic(ctx context.Context) error {
log.Printf("creating S3 bucket... Name: %s, Region: %s \n", a.bucketName, a.Region())
bucket := aws.String(a.bucketName)
_, err := a.Client.CreateBucket(ctx, &s3.CreateBucketInput{
var input *s3.CreateBucketInput
if a.Region() == "us-east-1" {
input = &s3.CreateBucketInput{
Bucket: bucket,
}
} else {
input = &s3.CreateBucketInput{
Bucket: bucket,
CreateBucketConfiguration: &s3types.CreateBucketConfiguration{
LocationConstraint: s3types.BucketLocationConstraint(a.Region()),
},
})
}
}
_, err := a.Client.CreateBucket(ctx, input)
if err != nil {
var bucketAlreadyOwnedByYou *s3types.BucketAlreadyOwnedByYou
if errors.As(err, &bucketAlreadyOwnedByYou) {
internal/controller/irsasetup_controller.go
+2 -2
View File
@@ -88,11 +88,11 @@ func (r *IRSASetupReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
}
defer func() {
if err := r.Get(ctx, req.NamespacedName, &irsav1alpha1.IRSASetup{}); err != nil {
if e := r.Get(ctx, req.NamespacedName, &irsav1alpha1.IRSASetup{}); e != nil {
return
}
statusHandler := handler.NewStatusHandler(kubeClient)
if err := statusHandler.Patch(ctx, obj); err != nil {
if e := statusHandler.Patch(ctx, obj); e != nil {
return
}
}()