diff --git a/go.mod b/go.mod index 56313e96..e470d0ca 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.22 require ( github.com/spf13/cobra v1.7.0 gotest.tools/v3 v3.3.0 - knative.dev/client-pkg v0.0.0-20240724091446-8393d69ad672 - knative.dev/hack v0.0.0-20240719133331-9c9eed6f6679 + knative.dev/client-pkg v0.0.0-20240730132256-5f325003a074 + knative.dev/hack v0.0.0-20240801232131-441a19fc9ead ) diff --git a/go.sum b/go.sum index 2ffbdd34..14396089 100644 --- a/go.sum +++ b/go.sum @@ -79,10 +79,10 @@ k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/client-pkg v0.0.0-20240724091446-8393d69ad672 h1:kPjt/WSTDTAOUKb4K9GUQafOc5IFHO8IguEE8Am3hW0= -knative.dev/client-pkg v0.0.0-20240724091446-8393d69ad672/go.mod h1:Y56KfZx3gJJpju88l86jQ9csxywLiopR0GkxCWW3+Kg= -knative.dev/hack v0.0.0-20240719133331-9c9eed6f6679 h1:tvbANb4KIO91DT1FGR4yCLA5E0qAmIeQ3DAGOkZGg4k= -knative.dev/hack v0.0.0-20240719133331-9c9eed6f6679/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= +knative.dev/client-pkg v0.0.0-20240730132256-5f325003a074 h1:kTWu6r6HvqODMLo+iGS8TpBEfxfClbBEkoju3/zxOUM= +knative.dev/client-pkg v0.0.0-20240730132256-5f325003a074/go.mod h1:Y56KfZx3gJJpju88l86jQ9csxywLiopR0GkxCWW3+Kg= +knative.dev/hack v0.0.0-20240801232131-441a19fc9ead h1:ViH1OEO0LViKa6W61YKUpLzOp7CJCFL9yLyIojHIuQ8= +knative.dev/hack v0.0.0-20240801232131-441a19fc9ead/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= knative.dev/pkg v0.0.0-20240716082220-4355f0c73608 h1:BOiRzcnRS9Z5ruxlCiS/K1/Hb5bUN0X4W3xCegdcYQE= knative.dev/pkg v0.0.0-20240716082220-4355f0c73608/go.mod h1:M67lDZ4KbltYSon0Ox4/6qjlZNOIXW4Ldequ81yofbw= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= diff --git a/vendor/knative.dev/hack/release.sh b/vendor/knative.dev/hack/release.sh index 7c5c2ba5..5cc8f323 100644 --- a/vendor/knative.dev/hack/release.sh +++ b/vendor/knative.dev/hack/release.sh @@ -33,36 +33,12 @@ readonly RELEASE_GCR="gcr.io/knative-releases/github.com/${ORG_NAME}/${REPO_NAME readonly NIGHTLY_SIGNING_IDENTITY="signer@knative-nightly.iam.gserviceaccount.com" readonly RELEASE_SIGNING_IDENTITY="signer@knative-releases.iam.gserviceaccount.com" -# Georeplicate images to {us,eu,asia}.gcr.io -readonly GEO_REPLICATION=(us eu asia) - # Simple banner for logging purposes. # Parameters: $* - message to display. function banner() { subheader "$*" } -# Tag images in the yaml files if $TAG is not empty. -# $KO_DOCKER_REPO is the registry containing the images to tag with $TAG. -# Parameters: $1..$n - files to parse for images (non .yaml files are ignored). -function tag_images_in_yamls() { - [[ -z ${TAG} ]] && return 0 - local SRC_DIR="${GOPATH}/src/" - local DOCKER_BASE="${KO_DOCKER_REPO}/${REPO_ROOT_DIR/$SRC_DIR}" - local GEO_REGIONS="${GEO_REPLICATION[@]} " - echo "Tagging any images under '${DOCKER_BASE}' with ${TAG}" - # shellcheck disable=SC2068 - for file in $@; do - [[ "${file##*.}" != "yaml" ]] && continue - echo "Inspecting ${file}" - for image in $(grep -o "${DOCKER_BASE}/[a-z\./-]\+@sha256:[0-9a-f]\+" "${file}"); do - for region in "" ${GEO_REGIONS// /. }; do - gcloud -q container images add-tag "${image}" "${region}${image%%@*}:${TAG}" - done - done - done -} - # Copy the given files to the $RELEASE_GCS_BUCKET bucket's "latest" directory. # If $TAG is not empty, also copy them to $RELEASE_GCS_BUCKET bucket's "previous" directory. # Parameters: $1..$n - files to copy. @@ -646,7 +622,6 @@ function run_validation_tests() { # Parameters: $1..$n - files to add to the release. function publish_artifacts() { (( ! PUBLISH_RELEASE )) && return - tag_images_in_yamls "${ARTIFACTS_TO_PUBLISH}" if [[ -n "${RELEASE_DIR}" ]]; then cp "${ARTIFACTS_TO_PUBLISH}" "${RELEASE_DIR}" || abort "cannot copy release to '${RELEASE_DIR}'" fi diff --git a/vendor/modules.txt b/vendor/modules.txt index 5da84890..fb954e6d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -25,9 +25,9 @@ gotest.tools/v3/internal/assert gotest.tools/v3/internal/difflib gotest.tools/v3/internal/format gotest.tools/v3/internal/source -# knative.dev/client-pkg v0.0.0-20240724091446-8393d69ad672 +# knative.dev/client-pkg v0.0.0-20240730132256-5f325003a074 ## explicit; go 1.22 knative.dev/client-pkg/pkg/plugin -# knative.dev/hack v0.0.0-20240719133331-9c9eed6f6679 +# knative.dev/hack v0.0.0-20240801232131-441a19fc9ead ## explicit; go 1.21 knative.dev/hack