diff --git a/go.mod b/go.mod index ed47a335..61b7c266 100644 --- a/go.mod +++ b/go.mod @@ -20,6 +20,6 @@ require ( k8s.io/client-go v0.21.4 k8s.io/code-generator v0.21.4 k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 - knative.dev/hack v0.0.0-20211026141922-a71c865b5f66 + knative.dev/hack v0.0.0-20211028194650-b96d65a5ff5e knative.dev/pkg v0.0.0-20211027105800-3b33e02e5b9c ) diff --git a/go.sum b/go.sum index fb914d9b..dff3cc60 100644 --- a/go.sum +++ b/go.sum @@ -1084,8 +1084,9 @@ k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7Br k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -knative.dev/hack v0.0.0-20211026141922-a71c865b5f66 h1:IFwqF/uo1Y7Bw8WtXTMRkxL2PXqj8qeKLP4+Wock5hk= knative.dev/hack v0.0.0-20211026141922-a71c865b5f66/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/hack v0.0.0-20211028194650-b96d65a5ff5e h1:0Hw2xdWYbcs2JRJnOLzAVh7APOtgro7gSno0228mnDg= +knative.dev/hack v0.0.0-20211028194650-b96d65a5ff5e/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/pkg v0.0.0-20211027105800-3b33e02e5b9c h1:BcNIB0BtExl970heGJZHeHa10I9zVbpoSUmFELHmQDg= knative.dev/pkg v0.0.0-20211027105800-3b33e02e5b9c/go.mod h1:xtF+ujTgEybZxA+e7NwKgHR8xMjYzHQUBxyaOUEFxwY= pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index 42eb428e..0877aace 100644 --- a/vendor/knative.dev/hack/library.sh +++ b/vendor/knative.dev/hack/library.sh @@ -537,9 +537,11 @@ function add_trap { # Update go deps. # Parameters (parsed as flags): # "--upgrade", bool, do upgrade. -# "--release " used with upgrade. The release version to upgrade +# "--release " used with upgrade. The release version to upgrade # Knative components. ex: --release v0.18. Defaults to -# "master". +# "main". +# "--module-release " used to define a different go module tag +# for a release. ex: --release v1.0 --module-release v0.27 # Additional dependencies can be included in the upgrade by providing them in a # global env var: FLOATING_DEPS # --upgrade will set GOPROXY to direct unless it is already set. @@ -554,13 +556,15 @@ function go_update_deps() { echo "=== Update Deps for Golang" local UPGRADE=0 - local VERSION="v9000.1" # release v9000 is so far in the future, it will always pick the default branch. + local RELEASE="v9000.1" # release v9000 is so far in the future, it will always pick the default branch. + local RELEASE_MODULE="" local DOMAIN="knative.dev" while [[ $# -ne 0 ]]; do parameter=$1 case ${parameter} in --upgrade) UPGRADE=1 ;; - --release) shift; VERSION="$1" ;; + --release) shift; RELEASE="$1" ;; + --module-release) shift; RELEASE_MODULE="$1" ;; --domain) shift; DOMAIN="$1" ;; *) abort "unknown option ${parameter}" ;; esac @@ -568,8 +572,14 @@ function go_update_deps() { done if [[ $UPGRADE == 1 ]]; then - group "Upgrading to ${VERSION}" - FLOATING_DEPS+=( $(run_go_tool knative.dev/test-infra/buoy buoy float ${REPO_ROOT_DIR}/go.mod --release ${VERSION} --domain ${DOMAIN}) ) + local buoyArgs=(--release ${RELEASE} --domain ${DOMAIN}) + if [ -n "$RELEASE_MODULE" ]; then + group "Upgrading for release ${RELEASE} to release module version ${RELEASE_MODULE}" + buoyArgs+=(--module-release ${RELEASE_MODULE}) + else + group "Upgrading to release ${RELEASE}" + fi + FLOATING_DEPS+=( $(run_go_tool knative.dev/test-infra/buoy buoy float ${REPO_ROOT_DIR}/go.mod "${buoyArgs[@]}") ) if [[ ${#FLOATING_DEPS[@]} > 0 ]]; then echo "Floating deps to ${FLOATING_DEPS[@]}" go get -d ${FLOATING_DEPS[@]} diff --git a/vendor/modules.txt b/vendor/modules.txt index ad1ff561..e2e41a2b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -610,7 +610,7 @@ k8s.io/kube-openapi/pkg/util/sets k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/trace -# knative.dev/hack v0.0.0-20211026141922-a71c865b5f66 +# knative.dev/hack v0.0.0-20211028194650-b96d65a5ff5e ## explicit knative.dev/hack # knative.dev/pkg v0.0.0-20211027105800-3b33e02e5b9c