From c1a42248850002e2dfa262e97f3f940bf7d4a911 Mon Sep 17 00:00:00 2001
From: Salah Aldeen Al Saleh <sg.alsaleh@gmail.com>
Date: Wed, 29 Nov 2023 20:14:21 +0000
Subject: [PATCH] one more test

---
 .github/actions/build-push-kotsadm-image/action.yml | 12 +++++-------
 .github/workflows/release.yaml                      |  1 +
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/actions/build-push-kotsadm-image/action.yml b/.github/actions/build-push-kotsadm-image/action.yml
index 21b80bbdf5..f4e568d7b6 100644
--- a/.github/actions/build-push-kotsadm-image/action.yml
+++ b/.github/actions/build-push-kotsadm-image/action.yml
@@ -1,6 +1,10 @@
 name: 'Build and push kotsadm image'
 description: 'Composite action for building and pushing kotsadm image'
 inputs:
+  workspace:
+    description: 'Github workspace'
+    required: true
+
   chainguard-gcp-wif-pool:
     description: 'GCP workload identity pool for Chainguard'
     required: true
@@ -48,10 +52,6 @@ runs:
         BUCKET: replicated-apk-registry
       shell: bash
       run: |
-        whoami
-        id -u
-        id -g
-
         # Install gcsfuse
         export GCSFUSE_REPO=gcsfuse-`lsb_release -c -s`
         echo "deb [signed-by=/usr/share/keyrings/cloud.google.asc] https://packages.cloud.google.com/apt $GCSFUSE_REPO main" | sudo tee /etc/apt/sources.list.d/gcsfuse.list
@@ -72,9 +72,6 @@ runs:
         # Make a copy of the APKINDEX.* since we'll need to write to it on package builds
         cp /tmp/gcsfuse/apk-repo/x86_64/APKINDEX.* ./packages/x86_64/
 
-        # Set the owner of the packages dir to the runner user
-        sudo chown -R runner:runner ./packages/
-
         ls -lR ./packages/
 
     - name: template melange and apko configs
@@ -94,6 +91,7 @@ runs:
         archs: x86_64
         sign-with-temporary-key: true
         cache-dir: ${{ steps.cache-dir.outputs.cache_dir }}
+        keyring-append: ${{ inputs.workspace }}/packages/chainguard-enterprise.rsa.pub
 
     - uses: chainguard-images/actions/apko-publish@main
       with:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 6507b453ea..0fef0c5808 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -190,6 +190,7 @@ jobs:
       uses: actions/checkout@v3
     - uses: ./.github/actions/build-push-kotsadm-image
       with:
+        workspace: ${{ github.workspace }}
         chainguard-gcp-wif-pool: ${{ secrets.CHAINGUARD_GCP_WIF_POOL }}
         chainguard-gcp-sa: ${{ secrets.CHAINGUARD_GCP_SA }}
         chainguard-gcp-project-id: ${{ secrets.CHAINGUARD_GCP_PROJECT_ID }}