Skip to content

Commit 6bfd4cc

Browse files
authored
feat/cherry: pick to 16 (#252)
* fix(ci): capture stderr when parsing helm push output (#249) `helm push` (3.16+) writes the human-readable "Pushed:" and "Digest:" lines to stderr, so the existing `$(helm push ...)` only captured an empty stdout and the awk that extracts the digest produced no match. Redirect stderr into stdout for the command substitution so the digest-parser sees the same output that's already visible in the runner log. The follow-up `sha256:[a-f0-9]{64}` regex check still guards against malformed input. Surfaced when publishing chart/v0.16.0 to oci://ghcr.io/nvidia/nodewright/charts: the push itself succeeded, but the subsequent attestation steps failed because no digest was extracted. Signed-off-by: Alex Yuskauskas <ayuskauskas@nvidia.com> * fix(chart): agent container path pointing to skyhook not nodewright --------- Signed-off-by: Alex Yuskauskas <ayuskauskas@nvidia.com>
1 parent b866489 commit 6bfd4cc

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,9 @@ jobs:
182182
183183
chart_repo="ghcr.io/nvidia/nodewright/charts"
184184
chart_subject="${chart_repo}/${CHART_NAME}"
185-
push_output="$(helm push "dist/${CHART_NAME}-${CHART_VERSION}.tgz" "oci://${chart_repo}")"
185+
# `helm push` writes "Pushed:" and "Digest:" to stderr (helm 3.16+),
186+
# so capture both streams or awk sees an empty string.
187+
push_output="$(helm push "dist/${CHART_NAME}-${CHART_VERSION}.tgz" "oci://${chart_repo}" 2>&1)"
186188
printf '%s\n' "${push_output}"
187189
chart_digest="$(awk '/^Digest:/ {print $2}' <<< "${push_output}")"
188190
if ! [[ "${chart_digest}" =~ ^sha256:[a-f0-9]{64}$ ]]; then

chart/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ controllerManager:
8888
digest: "sha256:3dfeda5d8fbfe7b6778bb92ad4437caa2e73c1670d54ae29e55ca7d0d5ef5408" # manifest list digest (multi-arch) on ghcr.io/nvidia/nodewright/operator:v0.16.0
8989
## agentImage: is the image used for the agent container. This image is the default for this install, but can be overridden in the CR at package level.
9090
agent:
91-
repository: ghcr.io/nvidia/skyhook/agent
91+
repository: ghcr.io/nvidia/nodewright/agent
9292
tag: "v6.4.2"
9393
digest: "sha256:7cd80f5ef351266dc08c3979e802f9dc936a1ed9fd02e199233e7968a3a0de3e" # manifest list digest (multi-arch) on ghcr.io/nvidia/skyhook/agent:v6.4.2
9494

0 commit comments

Comments
 (0)