upgrade to latest dependencies (#336)

bumping knative.dev/eventing 2eb07cb...b498c7f: > b498c7f IMC dispatcher Endpoints status propagation (# 5854) bumping knative.dev/hack f1228dd...b96d65a: > b96d65a Bring in update-deps fixes for Go module versioning (# 94) bumping knative.dev/pkg f7b70f5...3b33e02: Signed-off-by: Knative Automation <[email protected]>
baum · Oct 29, 2021 · 3db41fb · 3db41fb
1 parent 8ddf73a
commit 3db41fb
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 18 deletions.
diff --git a/go.mod b/go.mod
@@ -11,9 +11,9 @@ require (
 	k8s.io/api v0.21.4
 	k8s.io/apimachinery v0.21.4
 	k8s.io/client-go v0.21.4
-	knative.dev/eventing v0.26.1-0.20211028061727-2eb07cbddd07
-	knative.dev/hack v0.0.0-20211027200727-f1228dd5e3e6
-	knative.dev/pkg v0.0.0-20211027171921-f7b70f5ce303
+	knative.dev/eventing v0.26.1-0.20211028192027-b498c7fd6eb7
+	knative.dev/hack v0.0.0-20211028194650-b96d65a5ff5e
+	knative.dev/pkg v0.0.0-20211027105800-3b33e02e5b9c
 )
 
 replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.2
diff --git a/go.sum b/go.sum
@@ -1097,17 +1097,16 @@ 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/eventing v0.26.1-0.20211028061727-2eb07cbddd07 h1:eY5jKeaR0YdWugZJNLec3BPvuaAw/+g3lVhBBxRXVv8=
-knative.dev/eventing v0.26.1-0.20211028061727-2eb07cbddd07/go.mod h1:27s/uaaUrAUKO/Wy7kR4R6mbj5zugQWCyEkod4dVw0I=
+knative.dev/eventing v0.26.1-0.20211028192027-b498c7fd6eb7 h1:pVoxH01Kt7biw0mBqZ6hYGtBUk7ydmIykUf6bmllbKY=
+knative.dev/eventing v0.26.1-0.20211028192027-b498c7fd6eb7/go.mod h1:27s/uaaUrAUKO/Wy7kR4R6mbj5zugQWCyEkod4dVw0I=
 knative.dev/hack v0.0.0-20211018110626-47ac3b032e60/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
 knative.dev/hack v0.0.0-20211026141922-a71c865b5f66/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
-knative.dev/hack v0.0.0-20211027200727-f1228dd5e3e6 h1:1mEJyeUZqScWmvHR+xHkaIRVUNPInxyNR+6lyJ/INu0=
-knative.dev/hack v0.0.0-20211027200727-f1228dd5e3e6/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/hack/schema v0.0.0-20211026141922-a71c865b5f66/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0=
 knative.dev/pkg v0.0.0-20211018141937-a34efd6b409d/go.mod h1:/d1+Wklc8blR39M4oEBu+GeLav4vsiiJwq61tJay7mc=
+knative.dev/pkg v0.0.0-20211027105800-3b33e02e5b9c h1:BcNIB0BtExl970heGJZHeHa10I9zVbpoSUmFELHmQDg=
 knative.dev/pkg v0.0.0-20211027105800-3b33e02e5b9c/go.mod h1:xtF+ujTgEybZxA+e7NwKgHR8xMjYzHQUBxyaOUEFxwY=
-knative.dev/pkg v0.0.0-20211027171921-f7b70f5ce303 h1:hRCMd6614KzGyGwTnfgakID3RjQb7wGn85l7ZuTOsjc=
-knative.dev/pkg v0.0.0-20211027171921-f7b70f5ce303/go.mod h1:xtF+ujTgEybZxA+e7NwKgHR8xMjYzHQUBxyaOUEFxwY=
 knative.dev/reconciler-test v0.0.0-20211019133535-04ea7ddac7e3/go.mod h1:ltMDlEIFo5/9ES92BhIWQkdZaHRnGGJvXcYlvPxZj5s=
 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
@@ -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,22 +556,30 @@ 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
     shift
   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
@@ -734,7 +734,7 @@ k8s.io/utils/buffer
 k8s.io/utils/integer
 k8s.io/utils/pointer
 k8s.io/utils/trace
-# knative.dev/eventing v0.26.1-0.20211028061727-2eb07cbddd07
+# knative.dev/eventing v0.26.1-0.20211028192027-b498c7fd6eb7
 ## explicit
 knative.dev/eventing/pkg/adapter/v2
 knative.dev/eventing/pkg/adapter/v2/util/crstatusevent
@@ -748,10 +748,10 @@ knative.dev/eventing/pkg/kncloudevents
 knative.dev/eventing/pkg/metrics
 knative.dev/eventing/pkg/metrics/source
 knative.dev/eventing/pkg/reconciler/source
-# knative.dev/hack v0.0.0-20211027200727-f1228dd5e3e6
+# knative.dev/hack v0.0.0-20211028194650-b96d65a5ff5e
 ## explicit
 knative.dev/hack
-# knative.dev/pkg v0.0.0-20211027171921-f7b70f5ce303
+# knative.dev/pkg v0.0.0-20211027105800-3b33e02e5b9c
 ## explicit
 knative.dev/pkg/apis
 knative.dev/pkg/apis/duck