upgrade to latest dependencies (#555)

bumping knative.dev/hack a71c865...b96d65a:
  > b96d65a Bring in update-deps fixes for Go module versioning (# 94)

Signed-off-by: Knative Automation <automation@knative.team>
This commit is contained in:
knative-automation 2021-10-28 17:34:51 -07:00 committed by GitHub
parent 079b595b82
commit c822022f04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 9 deletions

2
go.mod
View File

@ -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
)

3
go.sum
View File

@ -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=

View File

@ -537,9 +537,11 @@ function add_trap {
# Update go deps.
# Parameters (parsed as flags):
# "--upgrade", bool, do upgrade.
# "--release <version>" used with upgrade. The release version to upgrade
# "--release <release-version>" used with upgrade. The release version to upgrade
# Knative components. ex: --release v0.18. Defaults to
# "master".
# "main".
# "--module-release <module-version>" 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[@]}

2
vendor/modules.txt vendored
View File

@ -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