diff --git a/Gopkg.lock b/Gopkg.lock index f7c4682f..d908ede9 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -966,7 +966,7 @@ [[projects]] branch = "master" - digest = "1:5acceb9ddfc654a91e633bb00531fc719fcaedda25d621162385ba5c2badc849" + digest = "1:eb75525bd4eb16133b648d1bbaa90e5eae2c10b42c97ae46b730c923ab799911" name = "knative.dev/pkg" packages = [ "apis", @@ -985,18 +985,18 @@ "metrics/metricskey", ] pruneopts = "T" - revision = "2fbb9db15cbb7971ad2b1f4266a437f5dcc33a51" + revision = "446f2e9f2cabb9a8249fad2cb19d92a0f918fae0" [[projects]] branch = "master" - digest = "1:f0fb577e7a666886e560755c78e19b56b23303575677a9beca899316eb6a137c" + digest = "1:fdc3106893e9ad75a8615d1326df00899c519ea71684092b4a10b3260f3c0c15" name = "knative.dev/test-infra" packages = [ "scripts", "tools/dep-collector", ] pruneopts = "UT" - revision = "5779f9c9458d0a85f734c0cad43c1510aa00b498" + revision = "ae2eca5b05181add212724579f1d85d3b104cdd7" [[projects]] digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" diff --git a/vendor/knative.dev/pkg/Gopkg.lock b/vendor/knative.dev/pkg/Gopkg.lock index abd5fe37..8a395679 100644 --- a/vendor/knative.dev/pkg/Gopkg.lock +++ b/vendor/knative.dev/pkg/Gopkg.lock @@ -1323,14 +1323,14 @@ [[projects]] branch = "master" - digest = "1:4ba0f80b3feed917d2c9a1aa79ea95836c3aef84589431cff77ffd01615a1150" + digest = "1:f0fb577e7a666886e560755c78e19b56b23303575677a9beca899316eb6a137c" name = "knative.dev/test-infra" packages = [ "scripts", "tools/dep-collector", ] pruneopts = "UT" - revision = "d5990f0e5a05d5819a40ad3b4de6227406850b48" + revision = "5779f9c9458d0a85f734c0cad43c1510aa00b498" [[projects]] digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" diff --git a/vendor/knative.dev/pkg/OWNERS_ALIASES b/vendor/knative.dev/pkg/OWNERS_ALIASES index 7a8145f0..9df668ee 100644 --- a/vendor/knative.dev/pkg/OWNERS_ALIASES +++ b/vendor/knative.dev/pkg/OWNERS_ALIASES @@ -45,11 +45,9 @@ aliases: - vagababov productivity-approvers: - - adrcunha - chaodaiG - chizhg productivity-reviewers: - - adrcunha - chaodaiG - coryrc - chizhg diff --git a/vendor/knative.dev/pkg/test/gke/request.go b/vendor/knative.dev/pkg/test/gke/request.go index c1fe803b..65a5b79e 100644 --- a/vendor/knative.dev/pkg/test/gke/request.go +++ b/vendor/knative.dev/pkg/test/gke/request.go @@ -46,7 +46,7 @@ type Request struct { // MaxNodes: the maximum number of nodes of the cluster MaxNodes int64 - // NodeType: node type of the cluster, e.g. n1-standard-4, n1-standard-8 + // NodeType: node type of the cluster, e.g. e2-standard-4, e2-standard-8 NodeType string // Region: region of the cluster, e.g. us-west1, us-central1 diff --git a/vendor/knative.dev/pkg/testutils/clustermanager/e2e-tests/gke.go b/vendor/knative.dev/pkg/testutils/clustermanager/e2e-tests/gke.go index bede1e6d..65229fcc 100644 --- a/vendor/knative.dev/pkg/testutils/clustermanager/e2e-tests/gke.go +++ b/vendor/knative.dev/pkg/testutils/clustermanager/e2e-tests/gke.go @@ -31,7 +31,7 @@ import ( const ( DefaultGKEMinNodes = 1 DefaultGKEMaxNodes = 3 - DefaultGKENodeType = "n1-standard-4" + DefaultGKENodeType = "e2-standard-4" DefaultGKERegion = "us-central1" DefaultGKEZone = "" regionEnv = "E2E_CLUSTER_REGION" diff --git a/vendor/knative.dev/pkg/testutils/clustermanager/perf-tests/pkg/benchmark.go b/vendor/knative.dev/pkg/testutils/clustermanager/perf-tests/pkg/benchmark.go index 96e9a7c7..93b92702 100644 --- a/vendor/knative.dev/pkg/testutils/clustermanager/perf-tests/pkg/benchmark.go +++ b/vendor/knative.dev/pkg/testutils/clustermanager/perf-tests/pkg/benchmark.go @@ -35,7 +35,7 @@ const ( // These default settings will be used for configuring the cluster, if not specified in cluster.yaml. defaultLocation = "us-central1" defaultNodeCount = 1 - defaultNodeType = "n1-standard-4" + defaultNodeType = "e2-standard-4" defaultAddons = "" ) diff --git a/vendor/knative.dev/pkg/testutils/clustermanager/perf-tests/pkg/testdir/test-benchmark1/cluster.yaml b/vendor/knative.dev/pkg/testutils/clustermanager/perf-tests/pkg/testdir/test-benchmark1/cluster.yaml index 4e1b5f1f..45c14a06 100644 --- a/vendor/knative.dev/pkg/testutils/clustermanager/perf-tests/pkg/testdir/test-benchmark1/cluster.yaml +++ b/vendor/knative.dev/pkg/testutils/clustermanager/perf-tests/pkg/testdir/test-benchmark1/cluster.yaml @@ -17,5 +17,5 @@ GKECluster: location: "us-west1" nodeCount: 4 - nodeType: "n1-standard-8" + nodeType: "e2-standard-8" addons: "istio" diff --git a/vendor/knative.dev/pkg/testutils/clustermanager/prow-cluster-operation/README.md b/vendor/knative.dev/pkg/testutils/clustermanager/prow-cluster-operation/README.md index 6aaeaa14..97f09724 100644 --- a/vendor/knative.dev/pkg/testutils/clustermanager/prow-cluster-operation/README.md +++ b/vendor/knative.dev/pkg/testutils/clustermanager/prow-cluster-operation/README.md @@ -12,7 +12,7 @@ This tool can be invoked from command line with following parameters: - `--min-nodes`: minumum number of nodes, default 1 - `--max-nodes`: maximum number of nodes, default 3 -- `--node-type`: GCE node type, default "n1-standard-4" +- `--node-type`: GCE node type, default "e2-standard-4" - `--region`: GKE region, default "us-central1" - `--zone`: GKE zone, default empty - `--project`: GCP project, default empty diff --git a/vendor/knative.dev/test-infra/scripts/README.md b/vendor/knative.dev/test-infra/scripts/README.md index 643115cd..e6e9f3c7 100644 --- a/vendor/knative.dev/test-infra/scripts/README.md +++ b/vendor/knative.dev/test-infra/scripts/README.md @@ -121,7 +121,7 @@ This is a helper script for Knative E2E test scripts. To use it: cluster creation in case of stockout. If defined, `E2E_CLUSTER_BACKUP_REGIONS` will be ignored thus it defaults to none. - `E2E_CLUSTER_MACHINE`: Cluster node machine type, defaults to - `n1-standard-4}`. + `e2-standard-4}`. - `E2E_MIN_CLUSTER_NODES`: Minimum number of nodes in the cluster when autoscaling, defaults to 1. - `E2E_MAX_CLUSTER_NODES`: Maximum number of nodes in the cluster when diff --git a/vendor/knative.dev/test-infra/scripts/e2e-tests.sh b/vendor/knative.dev/test-infra/scripts/e2e-tests.sh index 0923a558..3a2fa89a 100755 --- a/vendor/knative.dev/test-infra/scripts/e2e-tests.sh +++ b/vendor/knative.dev/test-infra/scripts/e2e-tests.sh @@ -47,7 +47,7 @@ export E2E_CLUSTER_ZONE=${E2E_CLUSTER_ZONE:-} readonly E2E_CLUSTER_BACKUP_REGIONS=${E2E_CLUSTER_BACKUP_REGIONS:-us-west1 us-east1} readonly E2E_CLUSTER_BACKUP_ZONES=${E2E_CLUSTER_BACKUP_ZONES:-} -readonly E2E_CLUSTER_MACHINE=${E2E_CLUSTER_MACHINE:-n1-standard-4} +readonly E2E_CLUSTER_MACHINE=${E2E_CLUSTER_MACHINE:-e2-standard-4} readonly E2E_GKE_ENVIRONMENT=${E2E_GKE_ENVIRONMENT:-prod} readonly E2E_GKE_COMMAND_GROUP=${E2E_GKE_COMMAND_GROUP:-beta} diff --git a/vendor/knative.dev/test-infra/scripts/library.sh b/vendor/knative.dev/test-infra/scripts/library.sh index 53c2ff40..0c921580 100755 --- a/vendor/knative.dev/test-infra/scripts/library.sh +++ b/vendor/knative.dev/test-infra/scripts/library.sh @@ -458,7 +458,7 @@ function start_knative_eventing() { # Install the stable release Knative/eventing in the current cluster. # Parameters: $1 - Knative Eventing version number, e.g. 0.6.0. function start_release_knative_eventing() { - start_knative_eventing "https://storage.googleapis.com/knative-releases/eventing/previous/v$1/release.yaml" + start_knative_eventing "https://storage.googleapis.com/knative-releases/eventing/previous/v$1/eventing.yaml" } # Install the latest stable Knative Eventing in the current cluster.