Merge #33628 #33665

33628: *: update deps r=RaduBerinde a=RaduBerinde

Update all deps except honnef.co/go/tools (will be updated separately) and some `github.com/cockroachdb/` deps which have been updated for go1.11.

Changes:
 - [x] Azure/azure-storage-blob-go@5152f14...45d0c5e
 - [x] IBM/sarama@bbdbe64...879f631
 - [x] aws/aws-sdk-go@ddc06f9...1f8a246
 - [x] axiomhq/hyperloglog@e8c19f1...4b99d0c
 - [x] cenkalti/backoff@62661b4...1e4cf3d
 - [x] cockroachdb/circuitbreaker@4f5b168...3e861b2
 - [x] distribution/distribution@40b7b58...91b0f05
 - [x] moby/moby@a4a816b...b4842cf
 - [x] go-ole/go-ole@a41e3c4...39dc848
 - [x] go-sql-driver/mysql@60d456a...c45f530
 - [x] google/go-github@35781f7...a5cb647
 - [x] google/pprof@3ea8567...e84dfd6
 - [x] googleapis/gax-go@b001040...c8a15ba
 - [x] grpc-ecosystem/grpc-gateway@9258377...aeab1d9
 - [x] jmespath/go-jmespath@0b12d6b...c2b33e8
 - [x] linkedin/goavro@1beee2a...af12b3c
 - [x] mattn/go-runewidth@ce7b0b5...3ee7d81
 - [x] montanaflynn/stats@db72e6c...945b007
 - [x] pkg/errors@645ef00...ba968bf
 - [x] prometheus/client_model@5c3871d...f287a10
 - [x] prometheus/common@4724e92...2998b13
 - [x] prometheus/procfs@1dc9a6c...b1a0a9a
 - [x] shirou/gopsutil@0f70a4a...ccc1c10
 - [x] sirupsen/logrus@bcd833d...e1e72e9
 - [x] stretchr/testify@f35b8ab...ffdc059
 - [x] etcd-io/etcd@1900a8e...fae6e92  (only 23731bf touches raft)
 - [x] golang/crypto@505ab14...ff983b9
 - [x] golang/net@351d144...1e06a53
 - [x] golang/sync@42b3178...37e7f08
 - [x] golang/sys@70b957f...48ac38b
 - [x] golang/tools@bcd4e47...d30e00c
 - [x] googleapis/google-api-go-client@9c79dee...19e022d
 - [x] golang/appengine@150dc57...e9657d8
 - [x] googleapis/go-genproto@a1fde74...6909d8a

Informs #30774.

Release note: None

33665: roachtest: fix start args in upgrade test r=petermattis a=tbg

They were all supposed to be removed, but we removed them only in one
instance.

Fixes #33663.

Release note: None

Co-authored-by: Radu Berinde <[email protected]>
Co-authored-by: Tobias Schottdorf <[email protected]>

Gopkg.toml

@@ -91,21 +91,22 @@ ignored = [
   source = "https://github.com/cockroachdb/gogoproto"
   branch = "v1.2.0-with-clone-fix"
 
-# github.com/docker/docker depends on a few functions not included in the
-# latest release: reference.{FamiliarName,ParseNormalizedNamed,TagNameOnly}.
-#
-# https://github.com/docker/distribution/commit/429c75f
-# https://github.com/docker/distribution/commit/2caeb61
-[[override]]
-  name = "github.com/docker/distribution"
-  branch = "master"
+# Pin to v1.1.0 because of https://github.com/kisielk/errcheck/issues/162.
+[[constraint]]
+  name = "github.com/kisielk/errcheck"
+  version = "=v1.1.0"
 
 # github.com/openzipkin-contrib/zipkin-go-opentracing requires a newer
 # version of thrift than is currently present in a release.
 [[override]]
   name = "github.com/apache/thrift"
   revision = "2b7365c54f823013cc6a4760798051b22743c103"
 
+# This repository has no releases (as of Jan 2019).
+[[override]]
+  name = "google.golang.org/genproto"
+  branch = "master"
+
 [prune]
   go-tests = true
   unused-packages = true

pkg/cmd/roachtest/upgrade.go

@@ -137,7 +137,7 @@ func registerUpgrade(r *registry) {
 				t.Fatal(err)
 			}
 			c.Put(ctx, cockroach, "./cockroach", c.Node(i))
-			c.Start(ctx, t, c.Node(i), startArgsDontEncrypt)
+			c.Start(ctx, t, c.Node(i))
 			if err := sleep(stageDuration); err != nil {
 				t.Fatal(err)
 			}
@@ -159,7 +159,7 @@ func registerUpgrade(r *registry) {
 			t.Fatal(err)
 		}
 		c.Put(ctx, cockroach, "./cockroach", c.Node(nodes))
-		c.Start(ctx, t, c.Node(nodes), startArgsDontEncrypt)
+		c.Start(ctx, t, c.Node(nodes))
 		if err := sleep(stageDuration); err != nil {
 			t.Fatal(err)
 		}
@@ -200,7 +200,7 @@ func registerUpgrade(r *registry) {
 		}
 
 		// Restart the previously stopped node.
-		c.Start(ctx, t, c.Node(nodes-1), startArgsDontEncrypt)
+		c.Start(ctx, t, c.Node(nodes-1))
 		if err := sleep(stageDuration); err != nil {
 			t.Fatal(err)
 		}