From ab6175eaf6d9b128417d3a11b55d8478c1d398ec Mon Sep 17 00:00:00 2001 From: Matt Moore Date: Thu, 17 Sep 2020 12:13:42 -0700 Subject: [PATCH] [master] Auto-update dependencies (#2825) Produced via: `./hack/update-deps.sh --upgrade && ./hack/update-codegen.sh` /assign dprotaso grantr samodell /cc dprotaso grantr samodell --- go.mod | 2 +- go.sum | 4 ++-- vendor/knative.dev/test-infra/scripts/e2e-tests.sh | 10 ++++++---- vendor/knative.dev/test-infra/scripts/infra-library.sh | 6 ++++-- vendor/modules.txt | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 6079600e63..02d296e4a7 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( gopkg.in/go-playground/assert.v1 v1.2.1 // indirect gopkg.in/go-playground/webhooks.v3 v3.13.0 gopkg.in/yaml.v2 v2.3.0 - knative.dev/test-infra v0.0.0-20200914203402-489e9e80675b + knative.dev/test-infra v0.0.0-20200916223841-d362984af929 ) replace go.opencensus.io => go.opencensus.io v0.20.2 diff --git a/go.sum b/go.sum index b21bb4259a..c2abe46cd3 100644 --- a/go.sum +++ b/go.sum @@ -1849,8 +1849,8 @@ knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55/go.mod h1:WqF1Azka+FxP 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-20200914203402-489e9e80675b h1:nA50WBTXgAcXmhb8iuupWJ1At8Ga1q9phE8juNc0wmI= -knative.dev/test-infra v0.0.0-20200914203402-489e9e80675b/go.mod h1:Pmg2c7Z7q7BGFUV/GOpU5BlrD3ePJft4MPqx8AYBplc= +knative.dev/test-infra v0.0.0-20200916223841-d362984af929 h1:jCHClMehwRQJ1BU4YPWX5eHjnJNFhYHJNsYIbJtHGZA= +knative.dev/test-infra v0.0.0-20200916223841-d362984af929/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/test-infra/scripts/e2e-tests.sh b/vendor/knative.dev/test-infra/scripts/e2e-tests.sh index 51356f9984..19a7b6eec1 100644 --- a/vendor/knative.dev/test-infra/scripts/e2e-tests.sh +++ b/vendor/knative.dev/test-infra/scripts/e2e-tests.sh @@ -167,10 +167,12 @@ function initialize() { (( IS_PROW )) && [[ -z "${GCP_PROJECT_ID:-}" ]] && IS_BOSKOS=1 - if (( SKIP_ISTIO_ADDON )); then - custom_flags+=("--addons=NodeLocalDNS") - else - custom_flags+=("--addons=Istio,NodeLocalDNS") + if [[ "${CLOUD_PROVIDER}" == "gke" ]]; then + if (( SKIP_ISTIO_ADDON )); then + custom_flags+=("--addons=NodeLocalDNS") + else + custom_flags+=("--addons=Istio,NodeLocalDNS") + fi fi readonly IS_BOSKOS diff --git a/vendor/knative.dev/test-infra/scripts/infra-library.sh b/vendor/knative.dev/test-infra/scripts/infra-library.sh index 1ab61d3e86..a27934997b 100644 --- a/vendor/knative.dev/test-infra/scripts/infra-library.sh +++ b/vendor/knative.dev/test-infra/scripts/infra-library.sh @@ -124,8 +124,10 @@ function create_test_cluster() { # Parameters: $1 - extra cluster creation flags # $2 - test command to run by the kubetest2 tester function create_kind_test_cluster() { - # TODO(chizhg): implement with kubetest2 - return 0 + local -n _custom_flags=$1 + local -n _test_command=$2 + + kubetest2 kind "${_custom_flags[@]}" --up --down --test=exec -- "${_test_command[@]}" } # Create a GKE test cluster with kubetest2 and run the test command. diff --git a/vendor/modules.txt b/vendor/modules.txt index 91d0ab3b7b..41f2b8c26a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -298,7 +298,7 @@ gopkg.in/go-playground/webhooks.v3/github # gopkg.in/yaml.v2 v2.3.0 ## explicit gopkg.in/yaml.v2 -# knative.dev/test-infra v0.0.0-20200914203402-489e9e80675b +# knative.dev/test-infra v0.0.0-20200916223841-d362984af929 ## explicit knative.dev/test-infra/scripts # go.opencensus.io => go.opencensus.io v0.20.2