From e64cc18c8c0457441c1e09a059f5cd7d03dbbd30 Mon Sep 17 00:00:00 2001
From: Erik Wilson <Erik.E.Wilson@gmail.com>
Date: Tue, 21 Jan 2020 16:57:50 -0700
Subject: [PATCH] Bump kine to v0.3.4

---
 go.mod                                             | 2 +-
 go.sum                                             | 4 ++--
 vendor/github.com/rancher/kine/pkg/server/watch.go | 6 +++---
 vendor/modules.txt                                 | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index 28702e4632..d3c45f9442 100644
--- a/go.mod
+++ b/go.mod
@@ -99,7 +99,7 @@ require (
 	github.com/rakelkar/gonetsh v0.0.0-20190719023240-501daadcadf8 // indirect
 	github.com/rancher/dynamiclistener v0.2.0
 	github.com/rancher/helm-controller v0.4.1
-	github.com/rancher/kine v0.3.3
+	github.com/rancher/kine v0.3.4
 	github.com/rancher/remotedialer v0.2.0
 	github.com/rancher/wrangler v0.4.0
 	github.com/rancher/wrangler-api v0.4.0
diff --git a/go.sum b/go.sum
index 4ef39afe6a..fca71f3666 100644
--- a/go.sum
+++ b/go.sum
@@ -720,8 +720,8 @@ github.com/rancher/flannel v0.11.0-k3s.1 h1:mIwnfWDafjzQgFkZeJ1AkFrrAT3EdBaA1giE
 github.com/rancher/flannel v0.11.0-k3s.1/go.mod h1:Hn4ZV+eq0LhLZP63xZnxdGwXEoRSxs5sxELxu27M3UA=
 github.com/rancher/helm-controller v0.4.1 h1:AbI3zXy2Qtw4e4A6IkxKozgnm6T3KKnUo6EzD1Pz0aU=
 github.com/rancher/helm-controller v0.4.1/go.mod h1:194LHuZRrxcD82bG1rJtOWsw98U4JbPhDWqvL7l3PAw=
-github.com/rancher/kine v0.3.3 h1:FTOQN1qHQMzMfA8/nd9/rWfdR3Xk4PbXcOqw5P3dJDw=
-github.com/rancher/kine v0.3.3/go.mod h1:xEMl0tLCva9/9me7mXJ3m9Vo6yqHgC4OU3NiK4CPrGQ=
+github.com/rancher/kine v0.3.4 h1:06QZ06zXCOoh1Vp/eT3eoOG9isIupoo8XJe0TvfK2Tw=
+github.com/rancher/kine v0.3.4/go.mod h1:xEMl0tLCva9/9me7mXJ3m9Vo6yqHgC4OU3NiK4CPrGQ=
 github.com/rancher/kubernetes v1.17.2-k3s1 h1:2Gp1NFkq6wyx5NqWFI+bjkAqbDT84jB8DUYVpGnAuW8=
 github.com/rancher/kubernetes v1.17.2-k3s1/go.mod h1:NbNV+69yL3eKiKDJ+ZEjqOplN3BFXKBeunzkoOy8WLo=
 github.com/rancher/kubernetes/staging/src/k8s.io/api v1.17.2-k3s1 h1:AuvaLsLh6T25e8wkpIjZLxj00rVsDqLKzLokMujXQ90=
diff --git a/vendor/github.com/rancher/kine/pkg/server/watch.go b/vendor/github.com/rancher/kine/pkg/server/watch.go
index 8da8040fe2..b8b70de9d9 100644
--- a/vendor/github.com/rancher/kine/pkg/server/watch.go
+++ b/vendor/github.com/rancher/kine/pkg/server/watch.go
@@ -131,14 +131,14 @@ func (w *watcher) Cancel(watchID int64, err error) {
 		reason = err.Error()
 	}
 	logrus.Debugf("WATCH CANCEL id=%d reason=%s", watchID, reason)
-	err = w.server.Send(&etcdserverpb.WatchResponse{
+	serr := w.server.Send(&etcdserverpb.WatchResponse{
 		Header:       &etcdserverpb.ResponseHeader{},
 		Canceled:     true,
 		CancelReason: "watch closed",
 		WatchId:      watchID,
 	})
-	if err != nil {
-		logrus.Errorf("WATCH Failed to send cancel response for watchID %d: %v", watchID, err)
+	if serr != nil && err != nil {
+		logrus.Errorf("WATCH Failed to send cancel response for watchID %d: %v", watchID, serr)
 	}
 }
 
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 32bfe4a801..f67142b7dc 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -726,7 +726,7 @@ github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm
 github.com/rancher/helm-controller/pkg/generated/informers/externalversions/internalinterfaces
 github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1
 github.com/rancher/helm-controller/pkg/helm
-# github.com/rancher/kine v0.3.3
+# github.com/rancher/kine v0.3.4
 github.com/rancher/kine/pkg/broadcaster
 github.com/rancher/kine/pkg/client
 github.com/rancher/kine/pkg/drivers/dqlite