diff --git a/internal/aws/aws.go b/internal/aws/aws.go index 9556a13..4e76472 100644 --- a/internal/aws/aws.go +++ b/internal/aws/aws.go @@ -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{ - Bucket: bucket, - CreateBucketConfiguration: &s3types.CreateBucketConfiguration{ - LocationConstraint: s3types.BucketLocationConstraint(a.Region()), - }, - }) + 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) { diff --git a/internal/controller/irsasetup_controller.go b/internal/controller/irsasetup_controller.go index ad55884..d253f43 100644 --- a/internal/controller/irsasetup_controller.go +++ b/internal/controller/irsasetup_controller.go @@ -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 } }()