Skip to content

Commit d4eb0a5

Browse files
authored
fix(ci): packaged Chart (#1092)
Signed-off-by: Miguel Martinez <[email protected]>
1 parent 40f96e6 commit d4eb0a5

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

.github/workflows/package_chart.yaml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,12 @@ jobs:
3131
permissions:
3232
packages: write
3333
env:
34-
CHAINLOOP_VERSION: 0.90.1
3534
CHAINLOOP_TOKEN: ${{ secrets.CHAINLOOP_TOKEN }}
3635
CHAINLOOP_WORKFLOW_NAME: ${{ needs.onboard_workflow.outputs.workflow_name }}
3736
steps:
3837
- name: Install Chainloop
3938
run: |
40-
curl -sfL https://raw.githubusercontent.com/chainloop-dev/chainloop/01ad13af08950b7bfbc83569bea207aeb4e1a285/docs/static/install.sh | bash -s -- --version v${{ env.CHAINLOOP_VERSION }}
39+
curl -sfL https://raw.githubusercontent.com/chainloop-dev/chainloop/01ad13af08950b7bfbc83569bea207aeb4e1a285/docs/static/install.sh | bash -s
4140
4241
- name: Docker login to Github Packages
4342
uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.2.0
@@ -60,16 +59,15 @@ jobs:
6059

6160
- name: Add Attestation (Helm Chart)
6261
run: |
63-
export PACKAGED_VERSION=$(cat ./deployment/chainloop/Chart.yaml | yq .appVersion)
64-
export CONTAINER_CP=$(cat deployment/chainloop/values.yaml | yq .controlplane.image.repository)
65-
export CONTAINER_CAS=$(cat deployment/chainloop/values.yaml | yq .cas.image.repository)
62+
export CONTAINER_CP=$(cat deployment/chainloop/Chart.yaml | yq -r .annotations.images | yq -r '.[] | select(.name == "control-plane") | .image')
63+
export CONTAINER_CAS=$(cat deployment/chainloop/Chart.yaml | yq -r .annotations.images | yq -r '.[] | select(.name == "artifact-cas") | .image')
6664
6765
# Attest Chart
6866
chainloop attestation add --name helm-chart --value chainloop*.tgz
6967
# Attest Control plane image
70-
chainloop attestation add --name control-plane-image --value "${CONTAINER_CP}:${PACKAGED_VERSION}"
68+
chainloop attestation add --name control-plane-image --value "${CONTAINER_CP}"
7169
# Attest CAS image
72-
chainloop attestation add --name artifact-cas-image --value "${CONTAINER_CAS}:${PACKAGED_VERSION}"
70+
chainloop attestation add --name artifact-cas-image --value "${CONTAINER_CAS}"
7371
7472
- name: Push Chart
7573
run: |
@@ -80,7 +78,6 @@ jobs:
8078
- name: Finish and Record Attestation
8179
if: ${{ success() }}
8280
run: |
83-
chainloop attestation status --full
8481
chainloop attestation push --key env://CHAINLOOP_SIGNING_KEY
8582
env:
8683
CHAINLOOP_SIGNING_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}

0 commit comments

Comments
 (0)