Skip to content

Commit e2129e8

Browse files
upgrade to latest dependencies (#149)
Signed-off-by: Knative Automation <[email protected]>
1 parent a9bd7b5 commit e2129e8

File tree

6 files changed

+24
-16
lines changed

6 files changed

+24
-16
lines changed

go.mod

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@ require (
2525
go.uber.org/zap v1.16.0
2626
gotest.tools v2.2.0+incompatible
2727
k8s.io/api v0.18.8
28-
k8s.io/apiextensions-apiserver v0.18.8 // indirect
2928
k8s.io/apimachinery v0.18.8
3029
k8s.io/client-go v12.0.0+incompatible
3130
k8s.io/code-generator v0.18.8
3231
k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29
33-
knative.dev/eventing v0.18.1-0.20201030152235-29ff9510e6f6
34-
knative.dev/hack v0.0.0-20201028205534-fe80f1c8af68
35-
knative.dev/pkg v0.0.0-20201030200734-72451e0d5973
32+
knative.dev/eventing v0.18.1-0.20201103105004-c96ac1b0c861
33+
knative.dev/hack v0.0.0-20201103151104-3d5abc3a0075
34+
knative.dev/pkg v0.0.0-20201103155803-bdd7fe1f177c
3635
)
3736

3837
replace (

go.sum

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2048,12 +2048,15 @@ k8s.io/utils v0.0.0-20200603063816-c1c6865ac451 h1:v8ud2Up6QK1lNOKFgiIVrZdMg7Mpm
20482048
k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
20492049
knative.dev/caching v0.0.0-20190719140829-2032732871ff/go.mod h1:dHXFU6CGlLlbzaWc32g80cR92iuBSpsslDNBWI8C7eg=
20502050
knative.dev/caching v0.0.0-20200116200605-67bca2c83dfa/go.mod h1:dHXFU6CGlLlbzaWc32g80cR92iuBSpsslDNBWI8C7eg=
2051-
knative.dev/eventing v0.18.1-0.20201030152235-29ff9510e6f6 h1:4/Xme9vJiXjWSMw+8A8vIZGEhwPxrWj10gT/mTnGzC8=
2052-
knative.dev/eventing v0.18.1-0.20201030152235-29ff9510e6f6/go.mod h1:5xnRo0y4YCoFY6+CNWGXRzR++BChSJc3f40lFSK1Q7A=
2051+
knative.dev/eventing v0.18.1-0.20201103105004-c96ac1b0c861 h1:iehzXL+qDTdzAxGh/FySEe9p/tgwbA+EoOE8wuA8tZ4=
2052+
knative.dev/eventing v0.18.1-0.20201103105004-c96ac1b0c861/go.mod h1:ecJwlnfFRDP2ezHoySLM89bJ7OiLbPr0MGbeOZ3HLEM=
20532053
knative.dev/eventing-contrib v0.6.1-0.20190723221543-5ce18048c08b/go.mod h1:SnXZgSGgMSMLNFTwTnpaOH7hXDzTFtw0J8OmHflNx3g=
20542054
knative.dev/eventing-contrib v0.11.2/go.mod h1:SnXZgSGgMSMLNFTwTnpaOH7hXDzTFtw0J8OmHflNx3g=
20552055
knative.dev/hack v0.0.0-20201028205534-fe80f1c8af68 h1:ygwpOK8B0PXurq88GHhym2uxKiiMJ+bRFwFeZHqGJNc=
20562056
knative.dev/hack v0.0.0-20201028205534-fe80f1c8af68/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
2057+
knative.dev/hack v0.0.0-20201102193445-9349aeeb6701/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
2058+
knative.dev/hack v0.0.0-20201103151104-3d5abc3a0075 h1:YAgWplKIy4O5e3F5vUUECmXAAyZ0M5ymo6fCt1jeZhs=
2059+
knative.dev/hack v0.0.0-20201103151104-3d5abc3a0075/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
20572060
knative.dev/pkg v0.0.0-20191101194912-56c2594e4f11/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
20582061
knative.dev/pkg v0.0.0-20191111150521-6d806b998379/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
20592062
knative.dev/pkg v0.0.0-20200207155214-fef852970f43/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
@@ -2064,9 +2067,9 @@ knative.dev/pkg v0.0.0-20200528142800-1c6815d7e4c9/go.mod h1:QgNZTxnwpB/oSpNcfnL
20642067
knative.dev/pkg v0.0.0-20200711004937-22502028e31a/go.mod h1:AqAJV6rYi8IGikDjJ/9ZQd9qKdkXVlesVnVjwx62YB8=
20652068
knative.dev/pkg v0.0.0-20201014184531-9e655c6b02f6 h1:yUP8KB8nf/FmovzKfGNei+ivXeTM8vwscSZCjC4LbBY=
20662069
knative.dev/pkg v0.0.0-20201014184531-9e655c6b02f6/go.mod h1:Vt8wg4OLNbZiW+ibtfysciKMgHkXfkxa8pAGXzHg8HI=
2067-
knative.dev/pkg v0.0.0-20201030122234-256ae893994a/go.mod h1:G805KH4tlnB6CIVHWIpE82pjx3/+2r9gUqNSOa78tns=
2068-
knative.dev/pkg v0.0.0-20201030200734-72451e0d5973 h1:58ogeuVFlGof8S5YoRE7HUaAQz3gn8a1ZAJjfkn+1OA=
2069-
knative.dev/pkg v0.0.0-20201030200734-72451e0d5973/go.mod h1:G805KH4tlnB6CIVHWIpE82pjx3/+2r9gUqNSOa78tns=
2070+
knative.dev/pkg v0.0.0-20201102194004-c6a8219d518d/go.mod h1:0/9g74jUIRReXdgCBFs85jHU3Ffyl1Fc9jxrllXYDVM=
2071+
knative.dev/pkg v0.0.0-20201103155803-bdd7fe1f177c h1:PKzK7mHZvewpB2PAQGZZHejy+QqsMxtl6YJtVNTzPo0=
2072+
knative.dev/pkg v0.0.0-20201103155803-bdd7fe1f177c/go.mod h1:+deD5KYoVtKHzDWQCuYMKlPOyPOi23UDlHHMw/IJiCI=
20702073
knative.dev/test-infra v0.0.0-20200407185800-1b88cb3b45a5/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ=
20712074
knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55/go.mod h1:WqF1Azka+FxPZ20keR2zCNtiQA1MP9ZB4BH4HuI+SIU=
20722075
knative.dev/test-infra v0.0.0-20200513011557-d03429a76034/go.mod h1:aMif0KXL4g19YCYwsy4Ocjjz5xgPlseYV+B95Oo4JGE=

vendor/knative.dev/hack/library.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,16 +512,19 @@ function go_update_deps() {
512512

513513
export GO111MODULE=on
514514
export GOFLAGS=""
515+
export GOSUMDB=off # Do not use the sum.golang.org service.
515516

516517
echo "=== Update Deps for Golang"
517518

518519
local UPGRADE=0
519520
local VERSION="master"
521+
local DOMAIN="knative.dev"
520522
while [[ $# -ne 0 ]]; do
521523
parameter=$1
522524
case ${parameter} in
523525
--upgrade) UPGRADE=1 ;;
524526
--release) shift; VERSION="$1" ;;
527+
--domain) shift; DOMAIN="$1" ;;
525528
*) abort "unknown option ${parameter}" ;;
526529
esac
527530
shift
@@ -539,7 +542,7 @@ function go_update_deps() {
539542
else
540543
echo "Respecting 'GOPROXY=${GOPROXY}'."
541544
fi
542-
FLOATING_DEPS+=( $(run_go_tool knative.dev/test-infra/buoy buoy float ${REPO_ROOT_DIR}/go.mod --release ${VERSION} --domain knative.dev) )
545+
FLOATING_DEPS+=( $(run_go_tool knative.dev/test-infra/buoy buoy float ${REPO_ROOT_DIR}/go.mod --release ${VERSION} --domain ${DOMAIN}) )
543546
if [[ ${#FLOATING_DEPS[@]} > 0 ]]; then
544547
echo "Floating deps to ${FLOATING_DEPS[@]}"
545548
go get -d ${FLOATING_DEPS[@]}

vendor/knative.dev/hack/performance-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ function update_clusters() {
109109
# Run the perf-tests tool
110110
# Parameters: $1..$n - parameters passed to the tool
111111
function run_perf_cluster_tool() {
112-
go run "${REPO_ROOT_DIR}"/vendor/knative.dev/pkg/testutils/clustermanager/perf-tests $@
112+
perf-tests $@
113113
}
114114

115115
# Delete the old clusters belonged to the current repo, and recreate them with the same configuration.

vendor/knative.dev/pkg/version/version.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const (
3030
// the Kubernetes minimum version required by Knative.
3131
KubernetesMinVersionKey = "KUBERNETES_MIN_VERSION"
3232

33-
defaultMinimumVersion = "v1.16.0"
33+
defaultMinimumVersion = "v1.17.0"
3434
)
3535

3636
func getMinimumVersion() string {
@@ -64,6 +64,10 @@ func CheckMinimumVersion(versioner discovery.ServerVersionInterface) error {
6464
// Compare returns 1 if the first version is greater than the
6565
// second version.
6666
if currentVersion.LT(minimumVersion) {
67+
if len(currentVersion.Pre) > 0 {
68+
return fmt.Errorf("pre-release kubernetes version %q is not compatible, need at least %q (this can be overridden with the env var %q); note pre-release version is smaller than the corresponding release version (e.g. 1.x.y-z < 1.x.y), using 1.x.y-0 as the minimum version is likely to help in this case",
69+
currentVersion, minimumVersion, KubernetesMinVersionKey)
70+
}
6771
return fmt.Errorf("kubernetes version %q is not compatible, need at least %q (this can be overridden with the env var %q)",
6872
currentVersion, minimumVersion, KubernetesMinVersionKey)
6973
}

vendor/modules.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,6 @@ k8s.io/api/storage/v1
684684
k8s.io/api/storage/v1alpha1
685685
k8s.io/api/storage/v1beta1
686686
# k8s.io/apiextensions-apiserver v0.18.8 => k8s.io/apiextensions-apiserver v0.18.8
687-
## explicit
688687
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
689688
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
690689
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1
@@ -1026,7 +1025,7 @@ k8s.io/utils/buffer
10261025
k8s.io/utils/integer
10271026
k8s.io/utils/pointer
10281027
k8s.io/utils/trace
1029-
# knative.dev/eventing v0.18.1-0.20201030152235-29ff9510e6f6
1028+
# knative.dev/eventing v0.18.1-0.20201103105004-c96ac1b0c861
10301029
## explicit
10311030
knative.dev/eventing/pkg/adapter/v2
10321031
knative.dev/eventing/pkg/adapter/v2/util/crstatusevent
@@ -1147,10 +1146,10 @@ knative.dev/eventing/test/test_images/heartbeats
11471146
knative.dev/eventing/test/test_images/performance
11481147
knative.dev/eventing/test/test_images/print
11491148
knative.dev/eventing/test/test_images/recordevents
1150-
# knative.dev/hack v0.0.0-20201028205534-fe80f1c8af68
1149+
# knative.dev/hack v0.0.0-20201103151104-3d5abc3a0075
11511150
## explicit
11521151
knative.dev/hack
1153-
# knative.dev/pkg v0.0.0-20201030200734-72451e0d5973
1152+
# knative.dev/pkg v0.0.0-20201103155803-bdd7fe1f177c
11541153
## explicit
11551154
knative.dev/pkg/apis
11561155
knative.dev/pkg/apis/duck

0 commit comments

Comments
 (0)