From 2f41102631907185fab6dc06f52bc4bef6d9ce64 Mon Sep 17 00:00:00 2001
From: mattmoor-sockpuppet <mattmoor+sockpuppet@google.com>
Date: Tue, 10 Sep 2019 07:26:12 -0700
Subject: [PATCH] Auto-update dependencies (#96)

Produced via:
  `dep ensure -update knative.dev/test-infra knative.dev/pkg`
/assign mattmoor
---
 Gopkg.lock                                       |  8 ++++----
 vendor/knative.dev/pkg/controller/controller.go  | 15 +++++++++++++--
 vendor/knative.dev/test-infra/scripts/release.sh |  4 +++-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index c8a52831..4ae06512 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -927,7 +927,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:0dca180a6449f2cd457f8efea003336352c5a412212fce072cad9661d5a71b61"
+  digest = "1:317a3a16bca32f918782654b282480b64d9cc5fd6357bd0bf2e36e174bf556bd"
   name = "knative.dev/pkg"
   packages = [
     "apis",
@@ -946,18 +946,18 @@
     "metrics/metricskey",
   ]
   pruneopts = "T"
-  revision = "528ad1c1dd627059b95aef17ccf27f9ab0f46c10"
+  revision = "7db4b798fbbc6b3960c3d7f9a4c97f0471dafcaf"
 
 [[projects]]
   branch = "master"
-  digest = "1:ab8dac73d2e2118e42f22b3f1208eb7a44ee9493a9e9d97976fea509f8e0337f"
+  digest = "1:e873112f19e9ce823bc01ca715de355bd5cf8e4d6045ed5f34b3eb0d6ec2c655"
   name = "knative.dev/test-infra"
   packages = [
     "scripts",
     "tools/dep-collector",
   ]
   pruneopts = "UT"
-  revision = "2c83a176f473acb4b6b851e98e53882f594ffb5c"
+  revision = "5449c8bad49d3528b5cb0b58a0cdce0f8a526f03"
 
 [solve-meta]
   analyzer-name = "dep"
diff --git a/vendor/knative.dev/pkg/controller/controller.go b/vendor/knative.dev/pkg/controller/controller.go
index 6c933275..6587313f 100644
--- a/vendor/knative.dev/pkg/controller/controller.go
+++ b/vendor/knative.dev/pkg/controller/controller.go
@@ -273,7 +273,12 @@ func (c *Impl) Run(threadiness int, stopCh <-chan struct{}) error {
 	defer runtime.HandleCrash()
 	sg := sync.WaitGroup{}
 	defer sg.Wait()
-	defer c.WorkQueue.ShutDown()
+	defer func() {
+		c.WorkQueue.ShutDown()
+		for c.WorkQueue.Len() > 0 {
+			time.Sleep(time.Millisecond * 100)
+		}
+	}()
 
 	// Launch workers to process resources that get enqueued to our workqueue.
 	logger := c.logger
@@ -350,7 +355,10 @@ func (c *Impl) handleErr(err error, key string) {
 	c.logger.Errorw("Reconcile error", zap.Error(err))
 
 	// Re-queue the key if it's an transient error.
-	if !IsPermanentError(err) {
+	// We want to check that the queue is shutting down here
+	// since controller Run might have exited by now (since while this item was
+	// being processed, queue.Len==0).
+	if !IsPermanentError(err) && !c.WorkQueue.ShuttingDown() {
 		c.WorkQueue.AddRateLimited(key)
 		c.logger.Debugf("Requeuing key %s due to non-permanent error (depth: %d)", key, c.WorkQueue.Len())
 		return
@@ -368,6 +376,9 @@ func (c *Impl) GlobalResync(si cache.SharedInformer) {
 // FilteredGlobalResync enqueues (with a delay) all objects from the
 // SharedInformer that pass the filter function
 func (c *Impl) FilteredGlobalResync(f func(interface{}) bool, si cache.SharedInformer) {
+	if c.WorkQueue.ShuttingDown() {
+		return
+	}
 	list := si.GetStore().List()
 	count := float64(len(list))
 	for _, obj := range list {
diff --git a/vendor/knative.dev/test-infra/scripts/release.sh b/vendor/knative.dev/test-infra/scripts/release.sh
index 20aa8fa3..39d680c0 100755
--- a/vendor/knative.dev/test-infra/scripts/release.sh
+++ b/vendor/knative.dev/test-infra/scripts/release.sh
@@ -485,7 +485,9 @@ function main() {
   parse_flags $@
   # Log what will be done and where.
   banner "Release configuration"
-  echo "- gcloud user: $(gcloud config get-value core/account)"
+  if which gcloud &>/dev/null ; then
+    echo "- gcloud user: $(gcloud config get-value core/account)"
+  fi
   echo "- Go path: ${GOPATH}"
   echo "- Repository root: ${REPO_ROOT_DIR}"
   echo "- Destination GCR: ${KO_DOCKER_REPO}"