diff --git a/go.mod b/go.mod index e6080e1ae..0827f2289 100644 --- a/go.mod +++ b/go.mod @@ -50,7 +50,7 @@ require ( k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 k8s.io/klog/v2 v2.70.2-0.20220707122935-0990e81f1a8f k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed - knative.dev/hack v0.0.0-20221104013908-8f3c7050408b + knative.dev/hack v0.0.0-20221114224536-b0354624aa29 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index 61499590d..8d48410f0 100644 --- a/go.sum +++ b/go.sum @@ -963,8 +963,8 @@ k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkI k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -knative.dev/hack v0.0.0-20221104013908-8f3c7050408b h1:EqqlOqjCy/hVexdmPpUjcplO2eZc12+jTdTpodfLaI4= -knative.dev/hack v0.0.0-20221104013908-8f3c7050408b/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= +knative.dev/hack v0.0.0-20221114224536-b0354624aa29 h1:FUHfJXlY5e9wFuSf5JlMONy/fQbofS7hEBfOMXLHXso= +knative.dev/hack v0.0.0-20221114224536-b0354624aa29/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= pgregory.net/rapid v0.3.3 h1:jCjBsY4ln4Atz78QoBWxUEvAHaFyNDQg9+WU62aCn1U= pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index faac80df7..918561ef8 100644 --- a/vendor/knative.dev/hack/library.sh +++ b/vendor/knative.dev/hack/library.sh @@ -647,7 +647,7 @@ function add_trap { local current_trap current_trap="$(trap -p "$trap_signal" | cut -d\' -f2)" local new_cmd="($cmd)" - [[ -n "${current_trap}" ]] && new_cmd="${current_trap};${new_cmd}" + [[ -n "${current_trap}" ]] && new_cmd="${new_cmd};${current_trap}" trap -- "${new_cmd}" "$trap_signal" done } diff --git a/vendor/knative.dev/hack/release.sh b/vendor/knative.dev/hack/release.sh index edce20063..1e5dc7f1c 100644 --- a/vendor/knative.dev/hack/release.sh +++ b/vendor/knative.dev/hack/release.sh @@ -98,7 +98,7 @@ RELEASE_NOTES="" RELEASE_BRANCH="" RELEASE_GCS_BUCKET="knative-nightly/${REPO_NAME}" RELEASE_DIR="" -KO_FLAGS="-P --platform=all --image-refs=imagerefs.txt" +KO_FLAGS="-P --platform=all" VALIDATION_TESTS="./test/presubmit-tests.sh" ARTIFACTS_TO_PUBLISH="" FROM_NIGHTLY_RELEASE="" @@ -312,8 +312,22 @@ function build_from_source() { sign_release || abort "error signing the release" } +function get_images_in_yamls() { + rm -rf imagerefs.txt + echo "Assembling a list of image refences to sign" + for file in $@; do + [[ "${file##*.}" != "yaml" ]] && continue + echo "Inspecting ${file}" + for image in $(grep -oh "\S*${KO_DOCKER_REPO}\S*" "${file}"); do + echo $image >> imagerefs.txt + done + done + sort -uo imagerefs.txt imagerefs.txt # Remove duplicate entries +} + # Build a release from source. function sign_release() { + get_images_in_yamls "${ARTIFACTS_TO_PUBLISH}" if (( ! IS_PROW )); then # This function can't be run by devs on their laptops return 0 fi diff --git a/vendor/modules.txt b/vendor/modules.txt index 3231ebc71..29096561f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1116,7 +1116,7 @@ k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/hack v0.0.0-20221104013908-8f3c7050408b +# knative.dev/hack v0.0.0-20221114224536-b0354624aa29 ## explicit; go 1.18 knative.dev/hack # sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2