Skip to content

Commit f0bc6f6

Browse files
authored
Use the wolfi signing key from the new location. (#13350)
ref: https://github.com/chainguard-dev/secrets/blob/main/wolfi-dev.tf Signed-off-by: Matt Moore <mattmoor@chainguard.dev>
1 parent 392796c commit f0bc6f6

2 files changed

Lines changed: 32 additions & 16 deletions

File tree

.github/workflows/build.yaml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,22 +165,21 @@ jobs:
165165
path: /tmp/artifacts/
166166
name: packages-aarch64
167167

168-
- name: 'Authenticate to Google Cloud'
168+
# This is managed here: https://github.com/chainguard-dev/secrets/blob/main/wolfi-dev.tf
169+
- uses: google-github-actions/auth@a6e2e39c0a0331da29f7fd2c2a20a427e8d3ad1f # v2.1.1
169170
id: auth
170-
uses: google-github-actions/auth@f6de81663f7788d05bd15bcce18f0e57f23f0846 # v2.0.1
171171
with:
172-
workload_identity_provider: "projects/618116202522/locations/global/workloadIdentityPools/prod-shared-e350/providers/prod-shared-gha"
173-
service_account: "prod-images-ci@prod-images-c6e5.iam.gserviceaccount.com"
174-
172+
workload_identity_provider: "projects/12758742386/locations/global/workloadIdentityPools/github-pool/providers/github-provider"
173+
service_account: "wolfi-dev@chainguard-github-secrets.iam.gserviceaccount.com"
175174
- uses: google-github-actions/setup-gcloud@5a5f7b85fca43e76e53463acaa9d408a03c98d3a # v2.0.1
176175
with:
177-
project_id: "prod-images-c6e5"
178-
176+
project_id: "chainguard-github-secrets"
179177
- uses: 'google-github-actions/get-secretmanager-secrets@ae0d4054c32840e2ced71207a9df55161ae3debc' # v2.0.0
180178
id: secrets
181179
with:
182180
secrets: |-
183-
token:prod-images-c6e5/melange-signing-key
181+
token:chainguard-github-secrets/wolfi-dev-signing-key
182+
184183
- run: echo "${{ steps.secrets.outputs.token }}" > ./wolfi-signing.rsa
185184
- run: |
186185
mkdir -p /etc/apk/keys
@@ -208,6 +207,15 @@ jobs:
208207
# of an abundance of caution.
209208
- run: rm ./wolfi-signing.rsa
210209

210+
# We use a different GSA for our interaction with GCS.
211+
- uses: google-github-actions/auth@f6de81663f7788d05bd15bcce18f0e57f23f0846 # v2.0.1
212+
with:
213+
workload_identity_provider: "projects/618116202522/locations/global/workloadIdentityPools/prod-shared-e350/providers/prod-shared-gha"
214+
service_account: "prod-images-ci@prod-images-c6e5.iam.gserviceaccount.com"
215+
- uses: google-github-actions/setup-gcloud@5a5f7b85fca43e76e53463acaa9d408a03c98d3a # v2.0.1
216+
with:
217+
project_id: "prod-images-c6e5"
218+
211219
- name: 'Upload packages to GCS'
212220
run: |
213221
for arch in "x86_64" "aarch64"; do

.github/workflows/withdraw-packages.yaml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,21 @@ jobs:
2727
docker run --rm -i -v $TMP:/out --entrypoint /bin/sh ghcr.io/wolfi-dev/sdk:latest@sha256:c2f7cbbfb67ff9cad47e25ff8eb87945a4c5a0a81b2fa9e93a1d9ac6504a8df5 -c "cp /usr/bin/wolfictl /out"
2828
echo "$TMP" >> $GITHUB_PATH
2929
30-
- name: 'Authenticate to Google Cloud'
30+
# This is managed here: https://github.com/chainguard-dev/secrets/blob/main/wolfi-dev.tf
31+
- uses: google-github-actions/auth@a6e2e39c0a0331da29f7fd2c2a20a427e8d3ad1f # v2.1.1
3132
id: auth
32-
uses: google-github-actions/auth@f6de81663f7788d05bd15bcce18f0e57f23f0846 # v2.0.1
3333
with:
34-
workload_identity_provider: "projects/618116202522/locations/global/workloadIdentityPools/prod-shared-e350/providers/prod-shared-gha"
35-
service_account: "prod-images-ci@prod-images-c6e5.iam.gserviceaccount.com"
36-
34+
workload_identity_provider: "projects/12758742386/locations/global/workloadIdentityPools/github-pool/providers/github-provider"
35+
service_account: "wolfi-dev@chainguard-github-secrets.iam.gserviceaccount.com"
3736
- uses: google-github-actions/setup-gcloud@5a5f7b85fca43e76e53463acaa9d408a03c98d3a # v2.0.1
3837
with:
39-
project_id: "prod-images-c6e5"
40-
38+
project_id: "chainguard-github-secrets"
4139
- uses: 'google-github-actions/get-secretmanager-secrets@ae0d4054c32840e2ced71207a9df55161ae3debc' # v2.0.0
4240
id: secrets
4341
with:
4442
secrets: |-
45-
token:prod-images-c6e5/melange-signing-key
43+
token:chainguard-github-secrets/wolfi-dev-signing-key
44+
4645
- run: echo "${{ steps.secrets.outputs.token }}" > ./wolfi-signing.rsa
4746
- run: |
4847
sudo mkdir -p /etc/apk/keys
@@ -56,6 +55,15 @@ jobs:
5655
curl https://packages.wolfi.dev/os/$arch/APKINDEX.tar.gz | wolfictl withdraw $(grep -v '\#' withdrawn-packages.txt) --signing-key="${{ github.workspace }}/wolfi-signing.rsa" > $arch/APKINDEX.tar.gz
5756
done
5857
58+
# We use a different GSA for our interaction with GCS.
59+
- uses: google-github-actions/auth@f6de81663f7788d05bd15bcce18f0e57f23f0846 # v2.0.1
60+
with:
61+
workload_identity_provider: "projects/618116202522/locations/global/workloadIdentityPools/prod-shared-e350/providers/prod-shared-gha"
62+
service_account: "prod-images-ci@prod-images-c6e5.iam.gserviceaccount.com"
63+
- uses: google-github-actions/setup-gcloud@5a5f7b85fca43e76e53463acaa9d408a03c98d3a # v2.0.1
64+
with:
65+
project_id: "prod-images-c6e5"
66+
5967
- name: Delete withdrawn packages
6068
run: |
6169
set -euo pipefail

0 commit comments

Comments
 (0)