Merge branch 'master' into jerome/controller/always-remove-update-ann…

…otation

go.mod

@@ -5,88 +5,52 @@ go 1.13
 require (
 	github.com/OpenPeeDeeP/depguard v1.0.1 // indirect
 	github.com/ant31/crd-validation v0.0.0-20180801212718-38f6a293f140
-	github.com/apex/log v1.1.2 // indirect
 	github.com/axw/gocov v1.0.0
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bmatcuk/doublestar v1.2.2 // indirect
-	github.com/briandowns/spinner v1.8.0 // indirect
-	github.com/cheekybits/genny v1.0.0 // indirect
 	github.com/cirocosta/grafana-sync v0.0.0-20181123215626-6cbb4a9501c1
 	github.com/d4l3k/messagediff v1.2.1
 	github.com/emicklei/go-restful v2.9.6+incompatible // indirect
 	github.com/evanphx/json-patch v4.5.0+incompatible
 	github.com/fortytw2/leaktest v1.3.0 // indirect
-	github.com/fossas/fossa-cli v1.0.19
+	github.com/fossas/fossa-cli v1.0.30
 	github.com/garethr/kubeval v0.0.0-20180821130434-c44f5193dc94
-	github.com/gnewton/jargo v0.0.0-20150417131352-41f5f186a805 // indirect
 	github.com/go-critic/go-critic v0.4.1 // indirect
 	github.com/go-openapi/inflect v0.19.0 // indirect
 	github.com/go-openapi/runtime v0.19.5 // indirect
 	github.com/go-openapi/spec v0.19.3
 	github.com/go-swagger/go-swagger v0.19.0
 	github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013 // indirect
 	github.com/gogo/protobuf v1.3.1
-	github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
-	github.com/golang/mock v1.3.1
-	github.com/golang/protobuf v1.3.3 // indirect
+	github.com/golang/mock v1.4.4
 	github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a // indirect
 	github.com/golangci/golangci-lint v1.18.0
 	github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
-	github.com/google/go-cmp v0.4.0 // indirect
 	github.com/googleapis/gnostic v0.3.1 // indirect
-	github.com/gorilla/handlers v1.4.2 // indirect
-	github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
-	github.com/hashicorp/go-multierror v1.0.0 // indirect
 	github.com/hashicorp/go-retryablehttp v0.6.0
-	github.com/hashicorp/golang-lru v0.5.3 // indirect
 	github.com/imdario/mergo v0.3.7 // indirect
-	github.com/kr/pretty v0.2.0 // indirect
 	github.com/m3db/build-tools v0.0.0-20181013000606-edd1bdd1df8a
-	github.com/m3db/m3 v0.14.2
+	github.com/m3db/m3 v0.15.16-0.20200928031244-a7b499d3884d
 	github.com/m3db/m3x v0.0.0-20190408051622-ebf3c7b94afd
-	github.com/m3db/prometheus_client_golang v0.8.1 // indirect
-	github.com/m3db/prometheus_client_model v0.0.0-20180517145114-8b2299a4bf7d // indirect
-	github.com/m3db/prometheus_common v0.0.0-20180517030744-25aaa3dff79b // indirect
-	github.com/m3db/prometheus_procfs v0.8.1 // indirect
 	github.com/m3db/tools v0.0.0-20181008195521-c6ded3f34878
-	github.com/magiconair/properties v1.8.1 // indirect
-	github.com/mattn/go-colorable v0.1.4 // indirect
-	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
 	github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d // indirect
 	github.com/olekukonko/tablewriter v0.0.4 // indirect
 	github.com/onsi/ginkgo v1.11.0 // indirect
 	github.com/onsi/gomega v1.8.1 // indirect
-	github.com/opentracing/opentracing-go v1.1.0 // indirect
-	github.com/pelletier/go-toml v1.4.0 // indirect
-	github.com/pkg/errors v0.8.1
-	github.com/rakyll/statik v0.1.6-0.20181128135655-79258177a57a
-	github.com/remeh/sizedwaitgroup v1.0.0 // indirect
-	github.com/rhysd/go-github-selfupdate v1.2.1 // indirect
-	github.com/rveen/ogdl v0.0.0-20200128162841-892980e34e3d // indirect
-	github.com/smartystreets/goconvey v1.6.4 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/stretchr/testify v1.4.0
+	github.com/pkg/errors v0.9.1
+	github.com/rakyll/statik v0.1.6
+	github.com/stretchr/testify v1.6.1
 	github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e // indirect
 	github.com/toqueteos/webbrowser v1.2.0 // indirect
-	github.com/uber-go/tally v3.3.12+incompatible
+	github.com/uber-go/tally v3.3.13+incompatible
 	github.com/ultraware/funlen v0.0.2 // indirect
 	github.com/urfave/cli v1.22.2 // indirect
-	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	go.uber.org/atomic v1.4.0 // indirect
-	go.uber.org/zap v1.10.0
-	golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 // indirect
-	golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3
-	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
+	go.uber.org/zap v1.13.0
+	golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f
 	golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375 // indirect
 	google.golang.org/appengine v1.6.2 // indirect
-	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
-	gopkg.in/go-ini/ini.v1 v1.51.1 // indirect
-	gopkg.in/ini.v1 v1.51.0 // indirect
-	gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
-	k8s.io/api v0.17.2
+	k8s.io/api v0.17.3
 	k8s.io/apiextensions-apiserver v0.17.2
-	k8s.io/apimachinery v0.17.2
-	k8s.io/client-go v0.17.2
+	k8s.io/apimachinery v0.17.3
+	k8s.io/client-go v0.17.3
 	k8s.io/code-generator v0.17.2
 	k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac // indirect
 	k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29
@@ -98,9 +62,3 @@ require (
 replace github.com/apache/thrift => github.com/m3db/thrift v0.0.0-20151001171628-53dd39833a08
 
 replace github.com/couchbase/vellum => github.com/m3db/vellum v0.0.0-20180830064305-51c732079c88
-
-// https://github.com/kubernetes/kubernetes/issues/88183
-// replace github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d
-
-// Pin this until transitive issues with uber-go/atomic are worked out.
-replace github.com/m3db/m3 => github.com/m3db/m3 v0.14.2