diff --git a/go.mod b/go.mod index 8fd2fece7..d549bd438 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( gopkg.in/go-playground/webhooks.v3 v3.13.0 gopkg.in/yaml.v2 v2.3.0 honnef.co/go/tools v0.0.1-2020.1.5 // indirect - knative.dev/hack v0.0.0-20221024013916-9d2ae47c16b2 + knative.dev/hack v0.0.0-20221104013908-8f3c7050408b ) replace go.opencensus.io => go.opencensus.io v0.20.2 diff --git a/go.sum b/go.sum index 787e1174b..6f4165416 100644 --- a/go.sum +++ b/go.sum @@ -538,8 +538,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75k= honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -knative.dev/hack v0.0.0-20221024013916-9d2ae47c16b2 h1:DvWcy2c6wvjDo+rPRWe9Rn5QEH8fiq/j4QWOka0wMvQ= -knative.dev/hack v0.0.0-20221024013916-9d2ae47c16b2/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= +knative.dev/hack v0.0.0-20221104013908-8f3c7050408b h1:EqqlOqjCy/hVexdmPpUjcplO2eZc12+jTdTpodfLaI4= +knative.dev/hack v0.0.0-20221104013908-8f3c7050408b/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= 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= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/vendor/knative.dev/hack/README.md b/vendor/knative.dev/hack/README.md index 89cae268a..607bc897a 100644 --- a/vendor/knative.dev/hack/README.md +++ b/vendor/knative.dev/hack/README.md @@ -149,9 +149,6 @@ This is a helper script for Knative E2E test scripts. To use it: 1. By default `knative_teardown()` and `test_teardown()` will be called after the tests finish, use `--skip-teardowns` if you don't want them to be called. -1. By default Istio is installed on the cluster via Addon, use - `--skip-istio-addon` if you choose not to have it preinstalled. - 1. By default Google Kubernetes Engine telemetry to Cloud Logging and Monitoring is disabled. This can be enabled by setting `ENABLE_GKE_TELEMETRY` to `true`. diff --git a/vendor/knative.dev/hack/e2e-tests.sh b/vendor/knative.dev/hack/e2e-tests.sh index 12cb6d614..cb186a4e2 100644 --- a/vendor/knative.dev/hack/e2e-tests.sh +++ b/vendor/knative.dev/hack/e2e-tests.sh @@ -60,6 +60,7 @@ function setup_test_cluster() { header "Setting up test cluster" kubectl get nodes + # Set the actual project the test cluster resides in # It will be a project assigned by Boskos if test is running on Prow, # otherwise will be ${E2E_GCP_PROJECT_ID} set up by user. @@ -90,8 +91,6 @@ function setup_test_cluster() { echo "- Cluster is ${k8s_cluster}" echo "- Docker is ${KO_DOCKER_REPO}" - export KO_DATA_PATH="${REPO_ROOT_DIR}/.git" - # Do not run teardowns if we explicitly want to skip them. (( ! SKIP_TEARDOWNS )) && add_trap teardown_test_resources EXIT @@ -99,9 +98,6 @@ function setup_test_cluster() { set +o errexit set +o pipefail - # Wait for Istio installation to complete, if necessary, before calling knative_setup. - # TODO(chizhg): is it really needed? - (( ! SKIP_ISTIO_ADDON )) && (wait_until_batch_job_complete istio-system || return 1) if function_exists knative_setup; then knative_setup || fail_test "Knative setup failed" fi @@ -131,7 +127,6 @@ function fail_test() { } SKIP_TEARDOWNS=0 -SKIP_ISTIO_ADDON=0 E2E_SCRIPT="" CLOUD_PROVIDER="gke" @@ -171,8 +166,8 @@ function initialize() { case ${parameter} in --run-tests) run_tests=1 ;; --skip-teardowns) SKIP_TEARDOWNS=1 ;; - # TODO(chizhg): remove this flag once the addons is defined as an env var. - --skip-istio-addon) SKIP_ISTIO_ADDON=1 ;; + --skip-istio-addon) echo "--skip-istio-addon is no longer supported" + ;; # This flag is a noop *) case ${parameter} in --cloud-provider) shift; CLOUD_PROVIDER="$1" ;; @@ -185,11 +180,7 @@ function initialize() { (( IS_PROW )) && [[ -z "${GCP_PROJECT_ID:-}" ]] && IS_BOSKOS=1 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/modules.txt b/vendor/modules.txt index 6a5cae1cb..20da61f36 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -286,7 +286,7 @@ gopkg.in/go-playground/webhooks.v3/github gopkg.in/yaml.v2 # honnef.co/go/tools v0.0.1-2020.1.5 ## explicit -# knative.dev/hack v0.0.0-20221024013916-9d2ae47c16b2 +# knative.dev/hack v0.0.0-20221104013908-8f3c7050408b ## explicit knative.dev/hack # go.opencensus.io => go.opencensus.io v0.20.2