diff --git a/go.mod b/go.mod index 62e6e0b9d..de53c9ffb 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( k8s.io/code-generator v0.22.5 k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 k8s.io/klog/v2 v2.40.1 - knative.dev/hack v0.0.0-20220118141833-9b2ed8471e30 + knative.dev/hack v0.0.0-20220128200847-51a42b2eb63e sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index c0ba97bcf..07edd953a 100644 --- a/go.sum +++ b/go.sum @@ -1152,8 +1152,8 @@ k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c h1:jvamsI1tn9V0S8jicyX82q k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a h1:8dYfu/Fc9Gz2rNJKB9IQRGgQOh2clmRzNIPPY1xLY5g= k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -knative.dev/hack v0.0.0-20220118141833-9b2ed8471e30 h1:UkNpCWCMM5C4AeQ8aTrPTuR/6OeARiqk+LEQ6tuMP7c= -knative.dev/hack v0.0.0-20220118141833-9b2ed8471e30/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/hack v0.0.0-20220128200847-51a42b2eb63e h1:pW3LMToyFhAhbHQWQwUHLY57i7gjvyFwFC8Sg6oNkJ8= +knative.dev/hack v0.0.0-20220128200847-51a42b2eb63e/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= pgregory.net/rapid v0.3.3 h1:jCjBsY4ln4Atz78QoBWxUEvAHaFyNDQg9+WU62aCn1U= pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/vendor/knative.dev/hack/README.md b/vendor/knative.dev/hack/README.md index a6a98c784..570f37097 100644 --- a/vendor/knative.dev/hack/README.md +++ b/vendor/knative.dev/hack/README.md @@ -167,6 +167,11 @@ This is a helper script for Knative E2E test scripts. To use it: 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`. + +1. By default Spot Worker nodes are disabled. This can be enabled by setting `ENABLE_PREEMPTIBLE_NODES` + to `true`. ### Sample end-to-end test script This script will test that the latest Knative Serving nightly release works. It diff --git a/vendor/knative.dev/hack/e2e-tests.sh b/vendor/knative.dev/hack/e2e-tests.sh index 537b3867e..9178eac2c 100644 --- a/vendor/knative.dev/hack/e2e-tests.sh +++ b/vendor/knative.dev/hack/e2e-tests.sh @@ -73,9 +73,6 @@ function setup_test_cluster() { is_protected_cluster "${k8s_cluster}" && \ abort "kubeconfig context set to ${k8s_cluster}, which is forbidden" - # Acquire cluster admin role for the current user. - acquire_cluster_admin_role "${k8s_cluster}" - # Setup KO_DOCKER_REPO if it is a GKE cluster. Incorporate an element of # randomness to ensure that each run properly publishes images. Don't # owerwrite KO_DOCKER_REPO if already set. diff --git a/vendor/knative.dev/hack/infra-library.sh b/vendor/knative.dev/hack/infra-library.sh index f87c259d1..a96210e2e 100644 --- a/vendor/knative.dev/hack/infra-library.sh +++ b/vendor/knative.dev/hack/infra-library.sh @@ -77,20 +77,6 @@ function dump_cluster_state() { echo "***************************************" } -# Sets the current user as cluster admin for the given cluster. -# Parameters: $1 - cluster context name -function acquire_cluster_admin_role() { - if [[ -z "$(kubectl get clusterrolebinding cluster-admin-binding 2> /dev/null)" ]]; then - if [[ "$1" =~ ^gke_.* ]]; then - kubectl create clusterrolebinding cluster-admin-binding \ - --clusterrole=cluster-admin --user="$(gcloud config get-value core/account)" - else - kubectl create clusterrolebinding cluster-admin-binding \ - --clusterrole=cluster-admin --user="prow" - fi - fi -} - # Create a test cluster and run the tests if provided. # Parameters: $1 - cluster provider name, e.g. gke # $2 - custom flags supported by kntest @@ -137,5 +123,15 @@ function create_gke_test_cluster() { local -n _custom_flags=$1 local -n _test_command=$2 - run_kntest kubetest2 gke "${_custom_flags[@]}" --test-command="${_test_command[*]}" + # We are disabling logs and metrics on Boskos Clusters by default as they are not used. Manually set ENABLE_GKE_TELEMETRY to true to enable telemetry + # and ENABLE_PREEMPTIBLE_NODES to true to create preemptible/spot VMs. VM Preemption is a rare event and shouldn't be distruptive given the fault tolerant nature of our tests. + local extra_gcloud_flags="" + if [[ "$ENABLE_GKE_TELEMETRY" != "true" ]]; then + extra_gcloud_flags="${extra_gcloud_flags} --logging=NONE --monitoring=NONE" + fi + + if [[ "$ENABLE_PREEMPTIBLE_NODES" == "true" ]]; then + extra_gcloud_flags="${extra_gcloud_flags} --preemptible" + fi + run_kntest kubetest2 gke "${_custom_flags[@]}" --test-command="${_test_command[*]}" --extra-gcloud-flags="${extra_gcloud_flags}" } diff --git a/vendor/knative.dev/hack/presubmit-tests.sh b/vendor/knative.dev/hack/presubmit-tests.sh index 70a399c8e..08bd85d4a 100644 --- a/vendor/knative.dev/hack/presubmit-tests.sh +++ b/vendor/knative.dev/hack/presubmit-tests.sh @@ -266,8 +266,6 @@ function main() { git version echo ">> ko version" [[ -f /ko_version ]] && cat /ko_version || echo "unknown" - echo ">> bazel version" - [[ -f /bazel_version ]] && cat /bazel_version || echo "unknown" if [[ "${DOCKER_IN_DOCKER_ENABLED}" == "true" ]]; then echo ">> docker version" docker version @@ -281,6 +279,8 @@ function main() { echo ">> maven version" mvn --version fi + echo ">> prow-tests image version" + [[ -f /commit_hash ]] && echo "Prow test image was built from $(cat /commit_hash) commit which is viewable at https://github.com/knative/test-infra/tree/$(cat /commit_hash) " || echo "unknown" fi [[ -z ${1:-} ]] && set -- "--all-tests" diff --git a/vendor/modules.txt b/vendor/modules.txt index d5691c154..6c2df9d55 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1060,7 +1060,7 @@ k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/pointer k8s.io/utils/trace -# knative.dev/hack v0.0.0-20220118141833-9b2ed8471e30 +# knative.dev/hack v0.0.0-20220128200847-51a42b2eb63e ## explicit; go 1.14 knative.dev/hack # sigs.k8s.io/structured-merge-diff/v4 v4.1.2