diff --git a/go.mod b/go.mod index 5026b761..72f32f7d 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,8 @@ require ( k8s.io/client-go v0.24.4 k8s.io/code-generator v0.24.4 k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 - knative.dev/hack v0.0.0-20220923094413-9b7638704a22 - knative.dev/pkg v0.0.0-20220921024409-d1d5c849073b + knative.dev/hack v0.0.0-20221003111221-b3c97904d3b5 + knative.dev/pkg v0.0.0-20220930124718-7c4fef1af593 ) require ( diff --git a/go.sum b/go.sum index e3c622f7..54cc0e3d 100644 --- a/go.sum +++ b/go.sum @@ -862,10 +862,10 @@ k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdi k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -knative.dev/hack v0.0.0-20220923094413-9b7638704a22 h1:Pty/0SZvsBxYRh3DXqjd/DcjuXE0m3+69pDl2wbfj00= -knative.dev/hack v0.0.0-20220923094413-9b7638704a22/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= -knative.dev/pkg v0.0.0-20220921024409-d1d5c849073b h1:DQn+gWHuXna0DlCYC9Cj/ElhUZlvblZVsgcDO0Gn4fQ= -knative.dev/pkg v0.0.0-20220921024409-d1d5c849073b/go.mod h1:v7MjUh7DVDGOFkiLfDTUt4hG75RwNJRyeQmlBz3wUAc= +knative.dev/hack v0.0.0-20221003111221-b3c97904d3b5 h1:iVRcbOZrI6XBc/JZh/IJZ56858QdoEV3DSbjy7XbKBg= +knative.dev/hack v0.0.0-20221003111221-b3c97904d3b5/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= +knative.dev/pkg v0.0.0-20220930124718-7c4fef1af593 h1:heNtvWPXAa9wcqO4JvAEw7LvwtccZIoHMav5aR2IK3M= +knative.dev/pkg v0.0.0-20220930124718-7c4fef1af593/go.mod h1:cR4oyE3s73iicCErqkykvurSercL+F0mnSKfGqV+9ak= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/vendor/knative.dev/hack/release.sh b/vendor/knative.dev/hack/release.sh index 6e0b7c58..a32a8e51 100644 --- a/vendor/knative.dev/hack/release.sh +++ b/vendor/knative.dev/hack/release.sh @@ -104,6 +104,9 @@ ARTIFACTS_TO_PUBLISH="" FROM_NIGHTLY_RELEASE="" FROM_NIGHTLY_RELEASE_GCS="" SIGNING_IDENTITY="" +APPLE_CODESIGN_KEY="" +APPLE_NOTARY_API_KEY="" +APPLE_CODESIGN_PASSWORD_FILE="" export KO_DOCKER_REPO="gcr.io/knative-nightly" # Build stripped binary to reduce size export GOFLAGS="-ldflags=-s -ldflags=-w" @@ -314,6 +317,21 @@ function sign_release() { if [ -z "${SIGN_IMAGES:-}" ]; then # Temporary Feature Gate return 0 fi + + # Notarizing mac binaries needs to be done before cosign as it changes the checksum values + # of the darwin binaries + if [ -n "${APPLE_CODESIGN_KEY}" ] && [ -n "${APPLE_CODESIGN_PASSWORD}" ] && [ -n "${APPLE_NOTARY_API_KEY}" ]; then + FILES=$(find -- * -type f -name "*darwin*") + for file in $FILES; do + rcodesign sign "${file}" --p12-file="${APPLE_CODESIGN_KEY}" \ + --code-signature-flags=runtime \ + --p12-password-file="${APPLE_CODESIGN_PASSWORD_FILE}" + done + zip files.zip "$FILES" + rcodesign notary-submit files.zip --api-key-path="${APPLE_NOTARY_API_KEY}" --wait + sha256sum "${ARTIFACTS_TO_PUBLISH//checksums.txt/}" > checksums.txt + fi + ## Sign the images with cosign ## For now, check if ko has created imagerefs.txt file. In the future, missing image refs will break ## the release for all jobs that publish images. @@ -438,6 +456,15 @@ function parse_flags() { [[ $1 =~ ^v[0-9]+-[0-9a-f]+$ ]] || abort "nightly tag must be 'vYYYYMMDD-commithash'" FROM_NIGHTLY_RELEASE=$1 ;; + --apple-codesign-key) + APPLE_CODESIGN_KEY=$1 + ;; + --apple-codesign-password-file) + APPLE_CODESIGN_PASSWORD_FILE=$1 + ;; + --apple-notary-api-key) + APPLE_NOTARY_API_KEY=$1 + ;; *) abort "unknown option ${parameter}" ;; esac esac diff --git a/vendor/modules.txt b/vendor/modules.txt index bb61cbba..e1127bf4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -684,10 +684,10 @@ k8s.io/utils/internal/third_party/forked/golang/net k8s.io/utils/net k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/hack v0.0.0-20220923094413-9b7638704a22 +# knative.dev/hack v0.0.0-20221003111221-b3c97904d3b5 ## explicit; go 1.18 knative.dev/hack -# knative.dev/pkg v0.0.0-20220921024409-d1d5c849073b +# knative.dev/pkg v0.0.0-20220930124718-7c4fef1af593 ## explicit; go 1.18 knative.dev/pkg/apis knative.dev/pkg/apis/duck