fix: fix azure portion of cloud uploader

Correctly propagate errors back. Drop ARM templates and use native APIs. Correctly handle restarted runs for creating image versions. fixes #7512. Signed-off-by: Christian Rolland <[email protected]>
siderolabs · Aug 3, 2023 · ac2aff5 · ac2aff5
1 parent 793dced
commit ac2aff5
Show file tree

Hide file tree

Showing 9 changed files with 122 additions and 312 deletions.
diff --git a/hack/cloud-image-uploader/aws.go b/hack/cloud-image-uploader/aws.go
@@ -18,6 +18,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
 	"github.com/google/uuid"
 	"github.com/siderolabs/go-retry/retry"
+	"github.com/ulikunitz/xz"
 	"golang.org/x/sync/errgroup"
 )
 
@@ -171,7 +172,7 @@ func (au *AWSUploader) registerAMIArch(ctx context.Context, region string, svc *
 
 		defer source.Close() //nolint:errcheck
 
-		image, err := ExtractFileFromTarGz("disk.raw", source)
+		image, err := xz.NewReader(source)
 		if err != nil {
 			return err
 		}

diff --git a/hack/cloud-image-uploader/azure-disk-template.json b/hack/cloud-image-uploader/azure-disk-template.json
diff --git a/hack/cloud-image-uploader/azure-image-version-template.json b/hack/cloud-image-uploader/azure-image-version-template.json