diff --git a/go.mod b/go.mod index 8c2ca5731..4ab75877f 100644 --- a/go.mod +++ b/go.mod @@ -18,10 +18,10 @@ require ( k8s.io/cli-runtime v0.21.4 k8s.io/client-go v0.21.4 k8s.io/code-generator v0.21.4 - knative.dev/eventing v0.26.1-0.20211026055720-a20ff702ad22 - knative.dev/hack v0.0.0-20211026141922-a71c865b5f66 - knative.dev/networking v0.0.0-20211027012100-31eca9c93514 - knative.dev/pkg v0.0.0-20211026205101-a8fb29270197 - knative.dev/serving v0.26.1-0.20211026205200-8f02c277d0b3 + knative.dev/eventing v0.26.1-0.20211028192027-b498c7fd6eb7 + knative.dev/hack v0.0.0-20211028194650-b96d65a5ff5e + knative.dev/networking v0.0.0-20211027163221-b9fa70516e8e + knative.dev/pkg v0.0.0-20211027105800-3b33e02e5b9c + knative.dev/serving v0.26.1-0.20211028155847-785c55ae7c0d sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index 3d19c4912..f2f876ca6 100644 --- a/go.sum +++ b/go.sum @@ -633,7 +633,6 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/tdigest v0.0.0-20180711151920-a7d76c6f093a/go.mod h1:9GkyshztGufsdPQWjH+ifgnIr3xNUL5syI70g2dzU1o= github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= -github.com/influxdata/tdigest v0.0.0-20191024211133-5d87a7585faa/go.mod h1:Z0kXnxzbTC2qrx4NaIzYkE1k66+6oEDQTvL95hQFh5Y= github.com/influxdata/tdigest v0.0.1/go.mod h1:Z0kXnxzbTC2qrx4NaIzYkE1k66+6oEDQTvL95hQFh5Y= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= @@ -1668,26 +1667,26 @@ k8s.io/legacy-cloud-providers v0.21.0/go.mod h1:bNxo7gDg+PGkBmT/MFZswLTWdSWK9kAl k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 h1:0T5IaWHO3sJTEmCP6mUlBvMukxPKUQWqiI/YuiBNMiQ= k8s.io/utils v0.0.0-20210111153108-fddb29f9d009/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -knative.dev/caching v0.0.0-20211019132135-6facf87d69eb/go.mod h1:tS8rRZiIuEafHxlqAN1Ve6PJTj/g/9wHw17/J8EUStE= -knative.dev/eventing v0.26.1-0.20211026055720-a20ff702ad22 h1:Ct/7gnzwh3c6P6/Pp7sf9+xp5pjRjitOMWMidkPMwa4= -knative.dev/eventing v0.26.1-0.20211026055720-a20ff702ad22/go.mod h1:LCl+kTMQ9wUSZDExZA8p6g9XqxUPPP5zn9lzqvGq+AQ= +knative.dev/caching v0.0.0-20211026205101-2ffdd31aa1e8/go.mod h1:WxzrnSGlNoMubORRhLc5lfrzActCvOiimFchaTvnMW4= +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-20211019034732-ced8ce706528/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/hack v0.0.0-20211025203920-02860f59a556/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= -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/schema v0.0.0-20211025203920-02860f59a556/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0= -knative.dev/networking v0.0.0-20211025234619-de9cf667af21/go.mod h1:JG3cL3rVHk1XiT4xHUzCGrfUPiafCq1x2z+IgHt2Kw0= -knative.dev/networking v0.0.0-20211027012100-31eca9c93514 h1:Gc9BtldtniEB2LeJoyISw89FCAcKgnUdO7gkYeurEhk= +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/networking v0.0.0-20211027012100-31eca9c93514/go.mod h1:JIzq6AOlhXrE/A84SHAWL2tLWFkvhcqprP1PRWMBVkQ= +knative.dev/networking v0.0.0-20211027163221-b9fa70516e8e h1:GCgmiOcCRLRKwdDEIzjPj72U/Zv/kijgHycaCC04SKQ= +knative.dev/networking v0.0.0-20211027163221-b9fa70516e8e/go.mod h1:PDpGPHc5iRADCsoiqg2LlLsv3GW/h+tAfgtsQ6K5a0U= knative.dev/pkg v0.0.0-20211018141937-a34efd6b409d/go.mod h1:/d1+Wklc8blR39M4oEBu+GeLav4vsiiJwq61tJay7mc= -knative.dev/pkg v0.0.0-20211019101734-caa95feec115/go.mod h1:FXppOkebhp8SBDFI0vVqmcwC98KBxodLheaVansP5r4= knative.dev/pkg v0.0.0-20211025151738-819d556cdaa5/go.mod h1:Q3PrYqZsnHU9rNJhyH/zhVdTojGfEqrkNnNG4arrJgE= -knative.dev/pkg v0.0.0-20211026205101-a8fb29270197 h1:ggHaO10xyDNzthZ2DcMJizAk9NPekvKZrMrGh9A0PmU= -knative.dev/pkg v0.0.0-20211026205101-a8fb29270197/go.mod h1:Q3PrYqZsnHU9rNJhyH/zhVdTojGfEqrkNnNG4arrJgE= +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/reconciler-test v0.0.0-20211019133535-04ea7ddac7e3/go.mod h1:ltMDlEIFo5/9ES92BhIWQkdZaHRnGGJvXcYlvPxZj5s= -knative.dev/serving v0.26.1-0.20211026205200-8f02c277d0b3 h1:S4maUhbXTSbQkkb/zb5rc7KPj1Z/+rdAutP94YGKYyw= -knative.dev/serving v0.26.1-0.20211026205200-8f02c277d0b3/go.mod h1:bJeZhGUxBvnK0/Sy5tH8dOqCXzVQMxT8Na9URBfWCrI= +knative.dev/serving v0.26.1-0.20211028155847-785c55ae7c0d h1:17eq4WTgSM9K010Sp/vcvmja8Egi5sfOlID/peCuFzY= +knative.dev/serving v0.26.1-0.20211028155847-785c55ae7c0d/go.mod h1:Ncqz2QN+l1GhkKICVnw6ArgOaxJ3FhK4eQH0WqZNg8k= pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= 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= diff --git a/vendor/knative.dev/eventing/pkg/apis/messaging/v1/in_memory_channel_lifecycle.go b/vendor/knative.dev/eventing/pkg/apis/messaging/v1/in_memory_channel_lifecycle.go index 88947290a..eeb65284e 100644 --- a/vendor/knative.dev/eventing/pkg/apis/messaging/v1/in_memory_channel_lifecycle.go +++ b/vendor/knative.dev/eventing/pkg/apis/messaging/v1/in_memory_channel_lifecycle.go @@ -25,7 +25,6 @@ import ( ) var imcCondSet = apis.NewLivingConditionSet( - InMemoryChannelConditionDispatcherReady, InMemoryChannelConditionServiceReady, InMemoryChannelConditionEndpointsReady, InMemoryChannelConditionAddressable, diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index 42eb428e4..0877aace4 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 f01b4f68b..efeedbf24 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -731,7 +731,7 @@ k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/pointer k8s.io/utils/trace -# knative.dev/eventing v0.26.1-0.20211026055720-a20ff702ad22 +# knative.dev/eventing v0.26.1-0.20211028192027-b498c7fd6eb7 ## explicit knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/duck @@ -757,10 +757,10 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1 knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2 knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake -# knative.dev/hack v0.0.0-20211026141922-a71c865b5f66 +# knative.dev/hack v0.0.0-20211028194650-b96d65a5ff5e ## explicit knative.dev/hack -# knative.dev/networking v0.0.0-20211027012100-31eca9c93514 +# knative.dev/networking v0.0.0-20211027163221-b9fa70516e8e ## explicit knative.dev/networking/pkg knative.dev/networking/pkg/apis/networking @@ -768,7 +768,7 @@ knative.dev/networking/pkg/apis/networking/v1alpha1 knative.dev/networking/pkg/client/clientset/versioned knative.dev/networking/pkg/client/clientset/versioned/scheme knative.dev/networking/pkg/client/clientset/versioned/typed/networking/v1alpha1 -# knative.dev/pkg v0.0.0-20211026205101-a8fb29270197 +# knative.dev/pkg v0.0.0-20211027105800-3b33e02e5b9c ## explicit knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -817,7 +817,7 @@ knative.dev/pkg/tracing/config knative.dev/pkg/tracing/propagation knative.dev/pkg/tracing/propagation/tracecontextb3 knative.dev/pkg/tracker -# knative.dev/serving v0.26.1-0.20211026205200-8f02c277d0b3 +# knative.dev/serving v0.26.1-0.20211028155847-785c55ae7c0d ## explicit knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1