From 62f685b3a0639ac58f03e533a971019be1c6774f Mon Sep 17 00:00:00 2001 From: Matt Moore Date: Thu, 12 Dec 2019 08:27:52 -0800 Subject: [PATCH] Auto-update dependencies (#158) Produced via: `dep ensure -update knative.dev/test-infra knative.dev/pkg` /assign n3wscott --- Gopkg.lock | 6 +++--- vendor/knative.dev/pkg/Gopkg.lock | 4 ++-- .../knative.dev/pkg/metrics/metricskey/constants_serving.go | 1 + vendor/knative.dev/pkg/reconciler/testing/table.go | 5 +++++ vendor/knative.dev/pkg/websocket/connection.go | 6 +++++- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 0a972943..ac49e390 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -931,7 +931,7 @@ [[projects]] branch = "master" - digest = "1:03e006a3d8b27f80596aef6ada367d5b08257d380fd7707cf5dfb28a12ffefee" + digest = "1:fd0a9998fe007e1d20ea859e93590525147081a9acb498a4445065d514e1fcef" name = "knative.dev/pkg" packages = [ "apis", @@ -950,7 +950,7 @@ "metrics/metricskey", ] pruneopts = "T" - revision = "9681cde37b185d133b618e6e09dc30f559cbed45" + revision = "bebd5557feae665ccf77bb1d8fee2758aa658264" [[projects]] branch = "master" @@ -961,7 +961,7 @@ "tools/dep-collector", ] pruneopts = "UT" - revision = "32d84d399e44c68470d2703a6de633ab0a826d49" + revision = "ed220f8d779f0dbbcc60f45f49eb12018af39168" [[projects]] digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" diff --git a/vendor/knative.dev/pkg/Gopkg.lock b/vendor/knative.dev/pkg/Gopkg.lock index 1701cc82..c54da45d 100644 --- a/vendor/knative.dev/pkg/Gopkg.lock +++ b/vendor/knative.dev/pkg/Gopkg.lock @@ -1296,14 +1296,14 @@ [[projects]] branch = "master" - digest = "1:052dcbb5c89b1843e0f5130dc9a0e815a89079c0329bc93c86f7d8c8569b8132" + digest = "1:c20a6bc69c6e4299afa4e4cb6016451fc751c5bb14025a271f3436f212ae73f7" name = "knative.dev/test-infra" packages = [ "scripts", "tools/dep-collector", ] pruneopts = "UT" - revision = "30f1a1f7b77ea46a34091c518b10ceed2c43fb3b" + revision = "32d84d399e44c68470d2703a6de633ab0a826d49" [[projects]] digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" diff --git a/vendor/knative.dev/pkg/metrics/metricskey/constants_serving.go b/vendor/knative.dev/pkg/metrics/metricskey/constants_serving.go index ec578d56..1d9e5cf5 100644 --- a/vendor/knative.dev/pkg/metrics/metricskey/constants_serving.go +++ b/vendor/knative.dev/pkg/metrics/metricskey/constants_serving.go @@ -66,5 +66,6 @@ var ( "knative.dev/internal/serving/revision/request_latencies", "knative.dev/internal/serving/controller/cert_expiration_durations", "knative.dev/internal/serving/controller/cert_total_num", + "knative.dev/internal/serving/controller/cert_issuance_latencies", ) ) diff --git a/vendor/knative.dev/pkg/reconciler/testing/table.go b/vendor/knative.dev/pkg/reconciler/testing/table.go index afdbe272..61438fa6 100644 --- a/vendor/knative.dev/pkg/reconciler/testing/table.go +++ b/vendor/knative.dev/pkg/reconciler/testing/table.go @@ -96,6 +96,11 @@ type TableRow struct { // Reconciler holds the controller.Reconciler that was used to evaluate this row. // It is populated here to make it accessible to PostConditions. Reconciler controller.Reconciler + + // OtherTestData is arbitrary data needed for the test. It is not used directly by the table + // testing framework. Instead it is used in the test method. E.g. setting up the responses for a + // mock client can go in here. + OtherTestData map[string]interface{} } func objKey(o runtime.Object) string { diff --git a/vendor/knative.dev/pkg/websocket/connection.go b/vendor/knative.dev/pkg/websocket/connection.go index bd9370c2..9180d5fa 100644 --- a/vendor/knative.dev/pkg/websocket/connection.go +++ b/vendor/knative.dev/pkg/websocket/connection.go @@ -106,7 +106,11 @@ func NewDurableSendingConnection(target string, logger *zap.SugaredLogger) *Mana // go func() {for range messageChan {}} func NewDurableConnection(target string, messageChan chan []byte, logger *zap.SugaredLogger) *ManagedConnection { websocketConnectionFactory := func() (rawConnection, error) { - dialer := websocket.DefaultDialer + dialer := &websocket.Dialer{ + // This needs to be relatively short to avoid the connection getting blackholed for a long time + // by restarting the serving side of the connection behind a Kubernetes Service. + HandshakeTimeout: 3 * time.Second, + } conn, _, err := dialer.Dial(target, nil) if err != nil { logger.Errorw("Websocket connection could not be established", zap.Error(err))