update

replicatedhq · Nov 29, 2023 · 8b3922c · 8b3922c
1 parent 1217869
commit 8b3922c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/.github/actions/build-push-kotsadm-image/action.yml b/.github/actions/build-push-kotsadm-image/action.yml
@@ -1,10 +1,6 @@
 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
@@ -73,7 +69,6 @@ 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/deploy/apko.yaml.tmpl b/deploy/apko.yaml.tmpl
@@ -4,6 +4,7 @@ contents:
     - ./packages/
   keyring:
     - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
+    - ./packages/chainguard-enterprise.rsa.pub
     - ./melange.rsa.pub
   packages:
     - kotsadm-head  # This is expected to be built locally by `melange`.

diff --git a/deploy/melange.yaml.tmpl b/deploy/melange.yaml.tmpl
@@ -12,7 +12,6 @@ environment:
       - https://packages.wolfi.dev/os
     keyring:
       - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
-      - ./packages/chainguard-enterprise.rsa.pub
     packages:
       - ca-certificates-bundle
       - busybox