diff --git a/go.mod b/go.mod index 51e5a156..8ffbfb7f 100644 --- a/go.mod +++ b/go.mod @@ -16,8 +16,8 @@ require ( k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible k8s.io/code-generator v0.18.6 k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29 - knative.dev/pkg v0.0.0-20200811231805-530eac8757df - knative.dev/test-infra v0.0.0-20200812052305-3d4180f44e0a + knative.dev/pkg v0.0.0-20200813155605-c9f9284521f1 + knative.dev/test-infra v0.0.0-20200813220306-af5517f4f576 ) replace ( diff --git a/go.sum b/go.sum index feea3f48..f5a39a83 100644 --- a/go.sum +++ b/go.sum @@ -1868,17 +1868,17 @@ knative.dev/pkg v0.0.0-20200505191044-3da93ebb24c2/go.mod h1:Q6sL35DdGs8hIQZKdaC knative.dev/pkg v0.0.0-20200515002500-16d7b963416f/go.mod h1:tMOHGbxtRz8zYFGEGpV/bpoTEM1o89MwYFC4YJXl3GY= knative.dev/pkg v0.0.0-20200528142800-1c6815d7e4c9/go.mod h1:QgNZTxnwpB/oSpNcfnLVlw+WpEwwyKAvJlvR3hgeltA= knative.dev/pkg v0.0.0-20200711004937-22502028e31a/go.mod h1:AqAJV6rYi8IGikDjJ/9ZQd9qKdkXVlesVnVjwx62YB8= -knative.dev/pkg v0.0.0-20200811231805-530eac8757df h1:JK8CnE/L51fwUv0yzob9zKE87aQ080nuXCr6SN26B4E= -knative.dev/pkg v0.0.0-20200811231805-530eac8757df/go.mod h1:udIbxBS/SJCL4sqnCG8HZArez9HjWmeqJCaVJP/h32I= +knative.dev/pkg v0.0.0-20200813155605-c9f9284521f1 h1:PSX1tbToanoE1Zibapx1bplCqKmouzizboWaFpuNJlE= +knative.dev/pkg v0.0.0-20200813155605-c9f9284521f1/go.mod h1:SBslmqP3sIJua+k1jKeN1L/appk0u97GFpyzfbUAcRQ= knative.dev/test-infra v0.0.0-20200407185800-1b88cb3b45a5/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ= knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55/go.mod h1:WqF1Azka+FxPZ20keR2zCNtiQA1MP9ZB4BH4HuI+SIU= knative.dev/test-infra v0.0.0-20200513011557-d03429a76034/go.mod h1:aMif0KXL4g19YCYwsy4Ocjjz5xgPlseYV+B95Oo4JGE= knative.dev/test-infra v0.0.0-20200519015156-82551620b0a9/go.mod h1:A5b2OAXTOeHT3hHhVQm3dmtbuWvIDP7qzgtqxA3/2pE= knative.dev/test-infra v0.0.0-20200707183444-aed09e56ddc7/go.mod h1:RjYAhXnZqeHw9+B0zsbqSPlae0lCvjekO/nw5ZMpLCs= -knative.dev/test-infra v0.0.0-20200811030605-72f8c9f3e933 h1:1nfmLI9iQ87ygMeKGLREhH+2KYa6XX/e6enu0PsasHY= -knative.dev/test-infra v0.0.0-20200811030605-72f8c9f3e933/go.mod h1:Pmg2c7Z7q7BGFUV/GOpU5BlrD3ePJft4MPqx8AYBplc= knative.dev/test-infra v0.0.0-20200812052305-3d4180f44e0a h1:A+kmQSU8C+1EZITmzdwq++3kin+SjgcMvkX85U6mAx0= knative.dev/test-infra v0.0.0-20200812052305-3d4180f44e0a/go.mod h1:Pmg2c7Z7q7BGFUV/GOpU5BlrD3ePJft4MPqx8AYBplc= +knative.dev/test-infra v0.0.0-20200813220306-af5517f4f576 h1:gsZMM8J2MA3iTSMOt5MTMt84y6H5PkIFMmUakqqogJ0= +knative.dev/test-infra v0.0.0-20200813220306-af5517f4f576/go.mod h1:Pmg2c7Z7q7BGFUV/GOpU5BlrD3ePJft4MPqx8AYBplc= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= diff --git a/vendor/knative.dev/pkg/hash/bucketer.go b/vendor/knative.dev/pkg/hash/bucketer.go index d0c1460a..41d26d97 100644 --- a/vendor/knative.dev/pkg/hash/bucketer.go +++ b/vendor/knative.dev/pkg/hash/bucketer.go @@ -111,6 +111,11 @@ func (bs *BucketSet) Owner(key string) string { return ret } +// HasBucket returns true if this BucketSet has the given bucket name. +func (bs *BucketSet) HasBucket(bkt string) bool { + return bs.buckets.Has(bkt) +} + // BucketList returns the bucket names of this BucketSet in random order. func (bs *BucketSet) BucketList() []string { bs.mu.RLock() diff --git a/vendor/knative.dev/test-infra/scripts/e2e-tests.sh b/vendor/knative.dev/test-infra/scripts/e2e-tests.sh index 87045064..a788b682 100644 --- a/vendor/knative.dev/test-infra/scripts/e2e-tests.sh +++ b/vendor/knative.dev/test-infra/scripts/e2e-tests.sh @@ -221,7 +221,7 @@ function create_test_cluster() { # Create cluster and run the tests create_test_cluster_with_retries "${E2E_SCRIPT} ${test_cmd_args}" \ - "${CLUSTER_CREATION_ARGS[@]}" "${extra_flags[@]}" + "${CLUSTER_CREATION_ARGS[@]}" "${extra_flags[@]}" "${EXTRA_KUBETEST2_FLAGS[@]}" local result="$?" # Ignore any errors below, this is a best-effort cleanup and shouldn't affect the test result. set +o errexit @@ -378,6 +378,7 @@ E2E_SCRIPT="" E2E_CLUSTER_VERSION="latest" GKE_ADDONS="" EXTRA_CLUSTER_CREATION_FLAGS=() +EXTRA_KUBETEST2_FLAGS=() E2E_SCRIPT_CUSTOM_FLAGS=() # Parse flags and initialize the test cluster. @@ -414,6 +415,7 @@ function initialize() { --gcp-project) GCP_PROJECT=$1 ;; --cluster-version) E2E_CLUSTER_VERSION=$1 ;; --cluster-creation-flag) EXTRA_CLUSTER_CREATION_FLAGS+=("$1") ;; + --kubetest2-flag) EXTRA_KUBETEST2_FLAGS+=("$1") ;; *) abort "unknown option ${parameter}" ;; esac esac @@ -431,12 +433,17 @@ function initialize() { (( IS_PROW )) && [[ -z "${GCP_PROJECT}" ]] && IS_BOSKOS=1 - (( SKIP_ISTIO_ADDON )) || GKE_ADDONS="--addons=Istio" + if (( SKIP_ISTIO_ADDON )); then + GKE_ADDONS="--addons=NodeLocalDNS" + else + GKE_ADDONS="--addons=Istio,NodeLocalDNS" + fi readonly RUN_TESTS readonly GCP_PROJECT readonly IS_BOSKOS readonly EXTRA_CLUSTER_CREATION_FLAGS + readonly EXTRA_KUBETEST2_FLAGS readonly SKIP_KNATIVE_SETUP readonly SKIP_TEARDOWNS readonly GKE_ADDONS diff --git a/vendor/knative.dev/test-infra/scripts/library.sh b/vendor/knative.dev/test-infra/scripts/library.sh index 251a9c89..1267f798 100644 --- a/vendor/knative.dev/test-infra/scripts/library.sh +++ b/vendor/knative.dev/test-infra/scripts/library.sh @@ -408,7 +408,7 @@ function report_go_test() { json="$(mktemp_with_extension "${ARTIFACTS}"/json_XXXXXXXX json)" echo "Running go test with args: ${go_test_args[*]}" # TODO(chizhg): change to `--format testname`? - capture_output "${report}" gotestsum --format standard-verbose \ + capture_output "${report}" gotestsum --format "${GO_TEST_VERBOSITY:-standard-verbose}" \ --junitfile "${xml}" --junitfile-testsuite-name relative --junitfile-testcase-classname relative \ --jsonfile "${json}" \ -- "${go_test_args[@]}" diff --git a/vendor/modules.txt b/vendor/modules.txt index 585d2b6a..1e0aec6e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -752,7 +752,7 @@ k8s.io/kube-openapi/pkg/util/sets k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/trace -# knative.dev/pkg v0.0.0-20200811231805-530eac8757df +# knative.dev/pkg v0.0.0-20200813155605-c9f9284521f1 ## explicit knative.dev/pkg/apis knative.dev/pkg/apis/duck/ducktypes @@ -776,7 +776,7 @@ knative.dev/pkg/metrics/metricskey knative.dev/pkg/network knative.dev/pkg/reconciler knative.dev/pkg/system -# knative.dev/test-infra v0.0.0-20200812052305-3d4180f44e0a +# knative.dev/test-infra v0.0.0-20200813220306-af5517f4f576 ## explicit knative.dev/test-infra/scripts knative.dev/test-infra/tools/dep-collector