diff --git a/go.mod b/go.mod index d5395b0d7..eeccca4d4 100644 --- a/go.mod +++ b/go.mod @@ -17,8 +17,8 @@ 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/hack v0.0.0-20201103151104-3d5abc3a0075 - knative.dev/net-istio v0.18.1-0.20201106015007-40b599209108 + knative.dev/hack v0.0.0-20201120192952-353db687ec5b + knative.dev/net-istio v0.19.1-0.20201121020252-76ca6614fd8c ) replace go.opencensus.io => go.opencensus.io v0.20.2 diff --git a/go.sum b/go.sum index ce09cd62f..5cb13682c 100644 --- a/go.sum +++ b/go.sum @@ -155,9 +155,9 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b/go.mod h1:NAJj0yf/KaRKURN6nyi7A9IZydMivZEm9oQLWNjfKDc= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -300,6 +300,7 @@ github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/mako v0.0.0-20190821191249-122f8dcef9e3/go.mod h1:YzLcVlL+NqWnmUEPuhS1LxDDwGO9WNbVlEXaF4IH35g= +github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0 h1:pMen7vLs8nvgEYhywH3KDWJIJTeEr2ULsVWHWYHQyBs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -373,7 +374,6 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/influxdata/tdigest v0.0.0-20180711151920-a7d76c6f093a/go.mod h1:9GkyshztGufsdPQWjH+ifgnIr3xNUL5syI70g2dzU1o= github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= @@ -525,8 +525,6 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.0.6/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/prometheus/procfs v0.0.11 h1:DhHlBtkHWPYi8O2y31JkK0TF+DGM+51OopZjH/Ia5qI= -github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/statsd_exporter v0.15.0/go.mod h1:Dv8HnkoLQkeEjkIE4/2ndAA7WL1zHKK7WMqFQqu72rw= @@ -1016,23 +1014,15 @@ istio.io/client-go v0.0.0-20200807182027-d287a5abb594/go.mod h1:q726ySPDHo2Ob6LH istio.io/gogo-genproto v0.0.0-20190930162913-45029607206a/go.mod h1:OzpAts7jljZceG4Vqi5/zXy/pOg1b209T3jb7Nv5wIs= istio.io/gogo-genproto v0.0.0-20191029161641-f7d19ec0141d/go.mod h1:OzpAts7jljZceG4Vqi5/zXy/pOg1b209T3jb7Nv5wIs= k8s.io/api v0.18.1/go.mod h1:3My4jorQWzSs5a+l7Ge6JBbIxChLnY8HnuT58ZWolss= -k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4= -k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY= -k8s.io/apiextensions-apiserver v0.18.4/go.mod h1:NYeyeYq4SIpFlPxSAB6jHPIdvu3hL0pc36wuRChybio= -k8s.io/apiextensions-apiserver v0.18.8/go.mod h1:7f4ySEkkvifIr4+BRrRWriKKIJjPyg9mb/p63dJKnlM= +k8s.io/api v0.18.12/go.mod h1:3sS78jmUoGHwERyMbEhxP6owcQ77UxGo+Yy+dKNWrh0= +k8s.io/apiextensions-apiserver v0.18.12/go.mod h1:nihADkPed1L37Vxpz2/BrtxO9mCtINH23aNtUe/CRLo= k8s.io/apimachinery v0.18.1/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= -k8s.io/apimachinery v0.18.4/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= -k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= -k8s.io/apiserver v0.18.4/go.mod h1:q+zoFct5ABNnYkGIaGQ3bcbUNdmPyOCoEBcg51LChY8= -k8s.io/apiserver v0.18.8/go.mod h1:12u5FuGql8Cc497ORNj79rhPdiXQC4bf53X/skR/1YM= +k8s.io/apimachinery v0.18.12/go.mod h1:PF5taHbXgTEJLU+xMypMmYTXTWPJ5LaW8bfsisxnEXk= +k8s.io/apiserver v0.18.12/go.mod h1:uFOeW4LlxS6KDgLWy3n3gh0DhC6m41QIFgL33ouk+4w= k8s.io/client-go v0.18.1/go.mod h1:iCikYRiXOj/yRRFE/aWqrpPtDt4P2JVWhtHkmESTcfY= -k8s.io/client-go v0.18.4/go.mod h1:f5sXwL4yAZRkAtzOxRWUhA/N8XzGCb+nPZI8PfobZ9g= -k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU= -k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= -k8s.io/code-generator v0.18.4/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= -k8s.io/code-generator v0.18.8/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= -k8s.io/component-base v0.18.4/go.mod h1:7jr/Ef5PGmKwQhyAz/pjByxJbC58mhKAhiaDu0vXfPk= -k8s.io/component-base v0.18.8/go.mod h1:00frPRDas29rx58pPCxNkhUfPbwajlyyvu8ruNgSErU= +k8s.io/client-go v0.18.12/go.mod h1:0aC8XkA09dX/goYqHQJ/kVv0zL1t+weOZt3pmz9LpxA= +k8s.io/code-generator v0.18.12/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= +k8s.io/component-base v0.18.12/go.mod h1:pRGKXsx2KWfsJqlDi4sbCc1jpaB87rXIIqupjhr5wj0= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200205140755-e0e292d8aa12/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= @@ -1045,14 +1035,16 @@ k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29/go.mod h1:F+5wygcW0wmRTnM3cOgIqGivxkwSWIWT5YdsDbeAOaU= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -knative.dev/hack v0.0.0-20201102193445-9349aeeb6701/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= -knative.dev/hack v0.0.0-20201103151104-3d5abc3a0075 h1:YAgWplKIy4O5e3F5vUUECmXAAyZ0M5ymo6fCt1jeZhs= -knative.dev/hack v0.0.0-20201103151104-3d5abc3a0075/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= -knative.dev/net-istio v0.18.1-0.20201106015007-40b599209108 h1:1ynQ2HgfxH/E5pI2aYYk87BfnCkILtBN3tOQZ8H9p0g= -knative.dev/net-istio v0.18.1-0.20201106015007-40b599209108/go.mod h1:vPZ5n97HR06pBPLSOh6EzwVLdcIl0j0MDIktX0I6ec8= -knative.dev/networking v0.0.0-20201103163404-b9f80f4537af/go.mod h1:0OaR4FLbs3Xn6UjeX1zYql9RWO8sLTO/ZMJS4jDbfFE= -knative.dev/pkg v0.0.0-20201103150904-7f1970af5b6f/go.mod h1:2hMxAUviPH2nl3BuODx5L6shYCdzA+7SPzQpdkcg9wc= -knative.dev/pkg v0.0.0-20201103163404-5514ab0c1fdf/go.mod h1:cuKOgUvJvnWHIps/apCXX8wZuMlT0dyMZLqRQfsENbQ= +knative.dev/hack v0.0.0-20201118155651-b31d3bb6bff9/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/hack v0.0.0-20201119025252-d3cb354f49ff/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/hack v0.0.0-20201119155951-11aa26c8eaf6/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/hack v0.0.0-20201120192952-353db687ec5b h1:Lc+AKgwhAZUD98mN++qTHeeaP6FRmS8fcwc/rXkP8G0= +knative.dev/hack v0.0.0-20201120192952-353db687ec5b/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/net-istio v0.19.1-0.20201121020252-76ca6614fd8c h1:p/WWMcTNjIoEBAWw0pLAnTf5i24Eg21KpQKTj3rop9c= +knative.dev/net-istio v0.19.1-0.20201121020252-76ca6614fd8c/go.mod h1:5cjBInwseXZ7RsigrU/nxzPmgIMw3O7xPR9DOOPkQrw= +knative.dev/networking v0.0.0-20201119153452-ac0823abbb90/go.mod h1:nSQJwxjDMbJ2/XxzJ2KR8bg6lf6RjzH7M+3Im1T51z0= +knative.dev/pkg v0.0.0-20201119021551-260026d54739/go.mod h1:3Udj7GogdjFg0M05MJm+aJjHx1BK/tyQarl5RB2k0Xo= +knative.dev/pkg v0.0.0-20201119170152-e5e30edc364a/go.mod h1:qv0lAVIPd4AmEsLyOOU6hzaN++wfBG+skRqtdcg0h7M= pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= 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= diff --git a/vendor/knative.dev/hack/README.md b/vendor/knative.dev/hack/README.md index af2cbc657..1df3cfe5b 100644 --- a/vendor/knative.dev/hack/README.md +++ b/vendor/knative.dev/hack/README.md @@ -220,7 +220,7 @@ benchmarking jobs for each repo. To use it: - `SERVICE_ACCOUNT_NAME`: Service account name for controlling GKE clusters and interacting with [Mako](https://github.com/google/mako) server. It MUST have `Kubernetes Engine Admin` and `Storage Admin` role, and be - [whitelisted](https://github.com/google/mako/blob/master/docs/ACCESS.md) by + [allowed](https://github.com/google/mako/blob/master/docs/ACCESS.md) by Mako admin. Defaults to `mako-job`. 1. [optional] Customize root path of the benchmarks. This root folder should diff --git a/vendor/knative.dev/hack/e2e-tests.sh b/vendor/knative.dev/hack/e2e-tests.sh index 19a7b6eec..0b8548f66 100644 --- a/vendor/knative.dev/hack/e2e-tests.sh +++ b/vendor/knative.dev/hack/e2e-tests.sh @@ -69,8 +69,12 @@ function setup_test_cluster() { # 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. - [[ "${k8s_cluster}" =~ ^gke_.* ]] && export KO_DOCKER_REPO=gcr.io/${E2E_PROJECT_ID}/${REPO_NAME}-e2e-img/${RANDOM} + # 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. + [ -z "${KO_DOCKER_REPO}" ] && \ + [[ "${k8s_cluster}" =~ ^gke_.* ]] && \ + export KO_DOCKER_REPO=gcr.io/${E2E_PROJECT_ID}/${REPO_NAME}-e2e-img/${RANDOM} # Safety checks is_protected_gcr "${KO_DOCKER_REPO}" && \ diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index 020eb7206..9b90b0025 100644 --- a/vendor/knative.dev/hack/library.sh +++ b/vendor/knative.dev/hack/library.sh @@ -353,13 +353,10 @@ function report_go_test() { report="$(mktemp)" local xml xml="$(mktemp_with_extension "${ARTIFACTS}"/junit_XXXXXXXX xml)" - local json - 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 "${GO_TEST_VERBOSITY:-standard-verbose}" \ --junitfile "${xml}" --junitfile-testsuite-name relative --junitfile-testcase-classname relative \ - --jsonfile "${json}" \ -- "${go_test_args[@]}" local failed=$? echo "Finished run, return code is ${failed}" @@ -517,7 +514,7 @@ function go_update_deps() { echo "=== Update Deps for Golang" local UPGRADE=0 - local VERSION="master" + local VERSION="v9000.1" # release v9000 is so far in the future, it will always pick the default branch. local DOMAIN="knative.dev" while [[ $# -ne 0 ]]; do parameter=$1 @@ -554,8 +551,11 @@ function go_update_deps() { echo "--- Go mod tidy and vendor" # Prune modules. - go mod tidy - go mod vendor + local orig_pipefail_opt=$(shopt -p -o pipefail) + set -o pipefail + go mod tidy 2>&1 | grep -v "ignoring symlink" || true + go mod vendor 2>&1 | grep -v "ignoring symlink" || true + eval "$orig_pipefail_opt" echo "--- Removing unwanted vendor files" @@ -744,6 +744,14 @@ function shellcheck_new_files() { fi } +function latest_version() { + local semver=$(git describe --match "v[0-9]*" --abbrev=0) + local major_minor=$(echo "$semver" | cut -d. -f1-2) + + # Get the latest patch release for the major minor + git tag -l "${major_minor}*" | sort -r --version-sort | head -n1 +} + # Initializations that depend on previous functions. # These MUST come last. diff --git a/vendor/knative.dev/hack/release.sh b/vendor/knative.dev/hack/release.sh index 4dcfa9158..bd0fdda7d 100644 --- a/vendor/knative.dev/hack/release.sh +++ b/vendor/knative.dev/hack/release.sh @@ -468,7 +468,6 @@ function parse_flags() { readonly RELEASE_BRANCH readonly RELEASE_GCS_BUCKET readonly RELEASE_DIR - readonly KO_DOCKER_REPO readonly VALIDATION_TESTS readonly FROM_NIGHTLY_RELEASE } @@ -478,11 +477,16 @@ function parse_flags() { function run_validation_tests() { (( SKIP_TESTS )) && return banner "Running release validation tests" + # Unset KO_DOCKER_REPO and restore it after the tests are finished. + # This will allow the tests to define their own KO_DOCKER_REPO. + local old_docker_repo="${KO_DOCKER_REPO}" + unset KO_DOCKER_REPO # Run tests. if ! $1; then banner "Release validation tests failed, aborting" abort "release validation tests failed" fi + export KO_DOCKER_REPO="${old_docker_repo}" } # Publishes the generated artifacts to directory, GCS, GitHub, etc. diff --git a/vendor/knative.dev/net-istio/third_party/istio-stable/install-istio.sh b/vendor/knative.dev/net-istio/third_party/istio-stable/install-istio.sh index 09cf92606..b4b356929 100644 --- a/vendor/knative.dev/net-istio/third_party/istio-stable/install-istio.sh +++ b/vendor/knative.dev/net-istio/third_party/istio-stable/install-istio.sh @@ -14,10 +14,19 @@ # See the License for the specific language governing permissions and # limitations under the License. +# Find the right arch so we can download the correct istioctl version +case "${OSTYPE}" in + darwin*) ARCH=osx ;; + linux*) ARCH=linux-amd64 ;; + msys*) ARCH=win ;; + *) echo "** unknown OS '${OSTYPE}'" ; exit 1 ;; +esac + # Download and unpack Istio ISTIO_VERSION=1.7.1 -ISTIO_TARBALL=istio-${ISTIO_VERSION}-linux-amd64.tar.gz +ISTIO_TARBALL=istio-${ISTIO_VERSION}-${ARCH}.tar.gz DOWNLOAD_URL=https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/${ISTIO_TARBALL} +SYSTEM_NAMESPACE="${SYSTEM_NAMESPACE:-"knative-serving"}" wget --no-check-certificate $DOWNLOAD_URL if [ $? != 0 ]; then @@ -32,6 +41,7 @@ tar xzf ${ISTIO_TARBALL} # Enable mTLS STRICT in mesh mode if [[ $MESH -eq 1 ]]; then kubectl apply -f "$(dirname $0)/extra/global-mtls.yaml" + kubectl patch configmap/config-istio -n ${SYSTEM_NAMESPACE} --patch='{"data":{"local-gateway.mesh":"mesh"}}' fi # Clean up diff --git a/vendor/knative.dev/net-istio/third_party/istio-stable/istio-ci-mesh.yaml b/vendor/knative.dev/net-istio/third_party/istio-stable/istio-ci-mesh.yaml index 10c223652..1ed01659c 100644 --- a/vendor/knative.dev/net-istio/third_party/istio-stable/istio-ci-mesh.yaml +++ b/vendor/knative.dev/net-istio/third_party/istio-stable/istio-ci-mesh.yaml @@ -58,27 +58,3 @@ spec: requests: cpu: 1000m memory: 1024Mi - - name: cluster-local-gateway - enabled: true - label: - istio: cluster-local-gateway - app: cluster-local-gateway - k8s: - resources: - limits: - cpu: 3000m - memory: 2048Mi - requests: - cpu: 1000m - memory: 1024Mi - service: - type: ClusterIP - ports: - - port: 15020 - name: status-port - - port: 80 - targetPort: 8080 - name: http2 - - port: 443 - targetPort: 8443 - name: https \ No newline at end of file diff --git a/vendor/knative.dev/net-istio/third_party/istio-stable/istio-ci-no-mesh.yaml b/vendor/knative.dev/net-istio/third_party/istio-stable/istio-ci-no-mesh.yaml index fdb249edc..d8b8b2a37 100644 --- a/vendor/knative.dev/net-istio/third_party/istio-stable/istio-ci-no-mesh.yaml +++ b/vendor/knative.dev/net-istio/third_party/istio-stable/istio-ci-no-mesh.yaml @@ -51,27 +51,3 @@ spec: requests: cpu: 1000m memory: 1024Mi - - name: cluster-local-gateway - enabled: true - label: - istio: cluster-local-gateway - app: cluster-local-gateway - k8s: - resources: - limits: - cpu: 3000m - memory: 2048Mi - requests: - cpu: 1000m - memory: 1024Mi - service: - type: ClusterIP - ports: - - port: 15020 - name: status-port - - port: 80 - targetPort: 8080 - name: http2 - - port: 443 - targetPort: 8443 - name: https \ No newline at end of file diff --git a/vendor/knative.dev/net-istio/third_party/istio-stable/istio-kind-mesh.yaml b/vendor/knative.dev/net-istio/third_party/istio-stable/istio-kind-mesh.yaml index c162e07ae..25d2837ac 100644 --- a/vendor/knative.dev/net-istio/third_party/istio-stable/istio-kind-mesh.yaml +++ b/vendor/knative.dev/net-istio/third_party/istio-stable/istio-kind-mesh.yaml @@ -57,24 +57,3 @@ spec: requests: cpu: 100m memory: 256Mi - - name: cluster-local-gateway - enabled: true - label: - istio: cluster-local-gateway - app: cluster-local-gateway - k8s: - resources: - requests: - cpu: 100m - memory: 256Mi - service: - type: ClusterIP - ports: - - port: 15020 - name: status-port - - port: 80 - targetPort: 8080 - name: http2 - - port: 443 - targetPort: 8443 - name: https diff --git a/vendor/knative.dev/net-istio/third_party/istio-stable/istio-kind-no-mesh.yaml b/vendor/knative.dev/net-istio/third_party/istio-stable/istio-kind-no-mesh.yaml index 2bca16ef0..8341ca8b3 100644 --- a/vendor/knative.dev/net-istio/third_party/istio-stable/istio-kind-no-mesh.yaml +++ b/vendor/knative.dev/net-istio/third_party/istio-stable/istio-kind-no-mesh.yaml @@ -50,24 +50,3 @@ spec: requests: cpu: 100m memory: 256Mi - - name: cluster-local-gateway - enabled: true - label: - istio: cluster-local-gateway - app: cluster-local-gateway - k8s: - resources: - requests: - cpu: 100m - memory: 256Mi - service: - type: ClusterIP - ports: - - port: 15020 - name: status-port - - port: 80 - targetPort: 8080 - name: http2 - - port: 443 - targetPort: 8443 - name: https diff --git a/vendor/knative.dev/net-istio/third_party/istio-stable/istio-minimal.yaml b/vendor/knative.dev/net-istio/third_party/istio-stable/istio-minimal.yaml index 5fa5c8cef..7e3f6086c 100644 --- a/vendor/knative.dev/net-istio/third_party/istio-stable/istio-minimal.yaml +++ b/vendor/knative.dev/net-istio/third_party/istio-stable/istio-minimal.yaml @@ -34,20 +34,3 @@ spec: ingressGateways: - name: istio-ingressgateway enabled: true - - name: cluster-local-gateway - enabled: true - label: - istio: cluster-local-gateway - app: cluster-local-gateway - k8s: - service: - type: ClusterIP - ports: - - port: 15020 - name: status-port - - port: 80 - targetPort: 8080 - name: http2 - - port: 443 - targetPort: 8443 - name: https diff --git a/vendor/knative.dev/net-istio/third_party/istio-stable/dummy.go b/vendor/knative.dev/net-istio/third_party/istio-stable/placeholder.go similarity index 100% rename from vendor/knative.dev/net-istio/third_party/istio-stable/dummy.go rename to vendor/knative.dev/net-istio/third_party/istio-stable/placeholder.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 87b2fafb1..569d5ac6c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -265,10 +265,10 @@ gopkg.in/go-playground/webhooks.v3/github # gopkg.in/yaml.v2 v2.3.0 ## explicit gopkg.in/yaml.v2 -# knative.dev/hack v0.0.0-20201103151104-3d5abc3a0075 +# knative.dev/hack v0.0.0-20201120192952-353db687ec5b ## explicit knative.dev/hack -# knative.dev/net-istio v0.18.1-0.20201106015007-40b599209108 +# knative.dev/net-istio v0.19.1-0.20201121020252-76ca6614fd8c ## explicit knative.dev/net-istio/third_party/istio-stable # go.opencensus.io => go.opencensus.io v0.20.2