From ffa48ac80359c9d748d02a2a3a95eaa7ef95d20a Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Wed, 26 Jul 2023 16:56:17 +0400 Subject: [PATCH] chore: workaround AWS AMI failures, disable Azure uploader Fixes #7513 AWS image uploads recently consistently fail in some regions, which blocks the release process. Allow to skip some AMIs if they fail to upload. Disable Azure until #7512 is resolved. Signed-off-by: Andrey Smirnov --- hack/cloud-image-uploader/aws.go | 4 +++- hack/cloud-image-uploader/main.go | 13 +++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/hack/cloud-image-uploader/aws.go b/hack/cloud-image-uploader/aws.go index 62c396209..a0d96c47a 100644 --- a/hack/cloud-image-uploader/aws.go +++ b/hack/cloud-image-uploader/aws.go @@ -243,7 +243,9 @@ func (au *AWSUploader) registerAMIArch(ctx context.Context, region string, svc * return retry.ExpectedError(fmt.Errorf("task status not found")) }) if err != nil { - return err + log.Printf("WARNING: aws: ignoring failure to import snapshot into %s/%s: %s", region, arch, err) + + return nil //nolint:nilerr } log.Printf("aws: import into %s/%s, snapshot ID %q", region, arch, snapshotID) diff --git a/hack/cloud-image-uploader/main.go b/hack/cloud-image-uploader/main.go index 662d7c292..f40f26805 100644 --- a/hack/cloud-image-uploader/main.go +++ b/hack/cloud-image-uploader/main.go @@ -92,13 +92,14 @@ func run() error { return aws.Upload(ctx) }) - g.Go(func() error { - azure := AzureUploader{ - Options: DefaultOptions, - } + // disabled until https://github.com/siderolabs/talos/issues/7512 is resolved + // g.Go(func() error { + // azure := AzureUploader{ + // Options: DefaultOptions, + // } - return azure.AzureGalleryUpload(ctx) - }) + // return azure.AzureGalleryUpload(ctx) + // }) if err = g.Wait(); err != nil { return fmt.Errorf("failed: %w", err)