From fac9d81895416907c3197fd036e6d64ba3fabece Mon Sep 17 00:00:00 2001 From: mattmoor-sockpuppet Date: Tue, 24 Sep 2019 07:35:20 -0700 Subject: [PATCH] Auto-update dependencies (#108) Produced via: `dep ensure -update knative.dev/test-infra knative.dev/pkg` /assign mattmoor --- Gopkg.lock | 6 +++--- vendor/knative.dev/pkg/OWNERS_ALIASES | 1 - vendor/knative.dev/pkg/test/spoof/spoof.go | 2 +- vendor/knative.dev/pkg/testutils/clustermanager/gke.go | 4 +--- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index d8785834..81b89b90 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -927,7 +927,7 @@ [[projects]] branch = "master" - digest = "1:6e410a2318808cce9fd9fcdc5c1821b96b89ad1cbe17251c9915c3c4da1b27fe" + digest = "1:df09f3d61be3d2702987a5079c79c652bf02428be6c7836f9865081039fcb86a" name = "knative.dev/pkg" packages = [ "apis", @@ -946,7 +946,7 @@ "metrics/metricskey", ] pruneopts = "T" - revision = "d90ec6a0150ac99846556d88d5a54093418ec2a7" + revision = "25b6d3af4d224e425b8a28cc9e256819eca2e959" [[projects]] branch = "master" @@ -957,7 +957,7 @@ "tools/dep-collector", ] pruneopts = "UT" - revision = "baf7e79986726748f7b36aa8f31f8bbfaa8717b6" + revision = "0496d5ca277c0826349264be609cb0bdf8ad5b64" [[projects]] digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" diff --git a/vendor/knative.dev/pkg/OWNERS_ALIASES b/vendor/knative.dev/pkg/OWNERS_ALIASES index 86d5793c..73a20f6e 100644 --- a/vendor/knative.dev/pkg/OWNERS_ALIASES +++ b/vendor/knative.dev/pkg/OWNERS_ALIASES @@ -54,7 +54,6 @@ aliases: - adrcunha - chaodaiG - coryrc - - dushyanthsc - Fredy-Z - srinivashegde86 - steuhs diff --git a/vendor/knative.dev/pkg/test/spoof/spoof.go b/vendor/knative.dev/pkg/test/spoof/spoof.go index d57d4e81..f6439f71 100644 --- a/vendor/knative.dev/pkg/test/spoof/spoof.go +++ b/vendor/knative.dev/pkg/test/spoof/spoof.go @@ -112,6 +112,7 @@ func New( } // Spoof the hostname at the resolver level + logf("Spoofing %s -> %s", domain, endpoint) transport := &http.Transport{ DialContext: func(ctx context.Context, network, addr string) (conn net.Conn, e error) { spoofed := addr @@ -119,7 +120,6 @@ func New( // The original hostname:port is spoofed by replacing the hostname by the value // returned by ResolveEndpoint. spoofed = endpoint + ":" + addr[i+1:] - logf("Spoofing %s -> %s", addr, spoofed) } return dialContext(ctx, network, spoofed) }, diff --git a/vendor/knative.dev/pkg/testutils/clustermanager/gke.go b/vendor/knative.dev/pkg/testutils/clustermanager/gke.go index 4c881fe8..c6655748 100644 --- a/vendor/knative.dev/pkg/testutils/clustermanager/gke.go +++ b/vendor/knative.dev/pkg/testutils/clustermanager/gke.go @@ -320,7 +320,7 @@ func (gc *GKECluster) Acquire() error { } // Retry another region if cluster creation failed. // TODO(chaodaiG): catch specific errors as we know what the error look like for stockout etc. - if len(regions) != i+1 { + if i != len(regions)-1 { errMsg = fmt.Sprintf("%sRetry another region %q for cluster creation", errMsg, regions[i+1]) } log.Printf(errMsg) @@ -430,8 +430,6 @@ func (gc *GKECluster) wait(location, opName string, wait time.Duration) error { } } } - - return err } // ensureProtected ensures not operating on protected project/cluster