From b94d47cbf3cbe7853bb821db656d351d1db18ffb Mon Sep 17 00:00:00 2001
From: Ethan Mosbaugh <ethan@replicated.com>
Date: Fri, 4 Oct 2024 17:28:41 -0500
Subject: [PATCH] fix(ci): correct bucket for upload k0s binaries (#1284)

* fix(ci): correct bucket for upload k0s binaries

* f

* f
---
 .github/workflows/release-k0s-patch.yaml | 7 +++++--
 Makefile                                 | 6 ++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release-k0s-patch.yaml b/.github/workflows/release-k0s-patch.yaml
index 27e6cc7b1..951898931 100644
--- a/.github/workflows/release-k0s-patch.yaml
+++ b/.github/workflows/release-k0s-patch.yaml
@@ -39,8 +39,11 @@ jobs:
 
       - name: Upload build
         env:
+          S3_BUCKET: tf-staging-embedded-cluster-bin
           AWS_ACCESS_KEY_ID: ${{ secrets.STAGING_EMBEDDED_CLUSTER_UPLOAD_IAM_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.STAGING_EMBEDDED_CLUSTER_UPLOAD_IAM_SECRET }}
-          AWS_REGION: "us-east-1"
+          AWS_REGION: us-east-1
         run: |
-          aws s3 cp k0s s3://custom-k0s-binaries/k0s-${{ github.event.inputs.tag }}-$(go env GOARCH)
+          object_key="custom-k0s-binaries/k0s-${{ github.event.inputs.tag }}-${{ matrix.runner.arch }}"
+          aws s3 cp "k0s s3://${S3_BUCKET}/${object_key}"
+          echo "::notice ::Binary uploaded to https://${S3_BUCKET}.s3.amazonaws.com/${object_key}"
diff --git a/Makefile b/Makefile
index 1e5bb183d..7c10cbb88 100644
--- a/Makefile
+++ b/Makefile
@@ -26,12 +26,10 @@ METADATA_K0S_BINARY_URL_OVERRIDE =
 METADATA_KOTS_BINARY_URL_OVERRIDE =
 METADATA_OPERATOR_BINARY_URL_OVERRIDE =
 
-ifeq ($(ARCH),amd64)
 ifeq ($(K0S_VERSION),v1.29.9+k0s.0-ec.0)
-K0S_BINARY_SOURCE_OVERRIDE = https://embedded-cluster-assets.s3.amazonaws.com/k0s-v1.29.9%2Bk0s.0-ec.0-amd64
+K0S_BINARY_SOURCE_OVERRIDE = https://tf-staging-embedded-cluster-bin.s3.amazonaws.com/custom-k0s-binaries/k0s-v1.29.9%2Bk0s.0-ec.0-$(ARCH)
 else ifeq ($(K0S_VERSION),v1.28.14+k0s.0-ec.0)
-K0S_BINARY_SOURCE_OVERRIDE = https://embedded-cluster-assets.s3.amazonaws.com/k0s-v1.28.14%2Bk0s.0-ec.0-amd64
-endif
+K0S_BINARY_SOURCE_OVERRIDE = https://tf-staging-embedded-cluster-bin.s3.amazonaws.com/custom-k0s-binaries/k0s-v1.28.14%2Bk0s.0-ec.0-$(ARCH)
 endif
 
 LD_FLAGS = \