Skip to content

Commit 6e2d060

Browse files
committed
f
1 parent ee64baf commit 6e2d060

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/image-deps-updater.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ jobs:
2929
curl -LO --fail --show-error https://packages.wolfi.dev/os/x86_64/APKINDEX.tar.gz
3030
tar -xzvf APKINDEX.tar.gz
3131
32-
calico_version=$(< APKINDEX grep -A1 "^P:calico$" | tail -n 1 | sed -n -e 's/V://p' | tr -d '\n')
32+
calico_node_version=$(< APKINDEX grep -A1 "^P:calico-node" | tail -n 1 | sed -n -e 's/V://p' | tr -d '\n')
3333
34-
sed "s/__CALICO_VERSION__/$calico_version/g" deploy/images/calico-node/apko.tmpl.yaml > deploy/images/calico-node/apko.yaml
34+
sed "s/__CALICO_NODE_VERSION__/$calico_node_version/g" deploy/images/calico-node/apko.tmpl.yaml > deploy/images/calico-node/apko.yaml
3535
3636
{
37-
echo "calico-tag=$calico_version"
37+
echo "calico-node-tag=$calico_node_version"
3838
} >> "$GITHUB_OUTPUT"
3939
4040
- name: Build and push calico-node image
4141
uses: ./.github/actions/build-dep-image-with-apko
4242
with:
4343
apko-config: deploy/images/calico-node/apko.yaml
44-
image-name: ttl.sh/ec/calico-node:${{ steps.get-tags.outputs.calico-tag }}
44+
image-name: ttl.sh/ec/calico-node:${{ steps.get-tags.outputs.calico-node-tag }}
4545
# registry-username: ${{ secrets.REGISTRY_USERNAME_STAGING }}
4646
# registry-password: ${{ secrets.REGISTRY_PASSWORD_STAGING }}
4747
overwrite: true # ${{ github.event.inputs.overwrite }}

deploy/images/calico-node/apko.tmpl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ contents:
44
keyring:
55
- https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
66
packages:
7-
- calico-node=__CALICO_VERSION__
7+
- calico-node=__CALICO_NODE_VERSION__
88

99
accounts:
1010
groups:

0 commit comments

Comments
 (0)