From 9ba893c06c1058f39ac1e1ed7791d8386fd70065 Mon Sep 17 00:00:00 2001 From: James Shubin Date: Thu, 15 Feb 2018 12:32:22 -0500 Subject: [PATCH] etcd: Bump to etcd v3.3 and golang 1.9 This moves us to etcd v3.3 (a new major release) which has some useful features but that requires version 1.9 of golang. --- .travis.yml | 2 -- docker/Dockerfile | 2 +- docker/Dockerfile.development | 2 +- docs/quick-start-guide.md | 4 ++-- prometheus/prometheus.go | 2 +- vendor/github.com/coreos/etcd | 2 +- vendor/github.com/grpc-ecosystem/go-grpc-prometheus | 2 +- vendor/github.com/grpc-ecosystem/grpc-gateway | 2 +- vendor/github.com/ugorji/go | 2 +- vendor/google.golang.org/grpc | 2 +- 10 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 782a51ec..73b6b7af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ os: - linux - osx go: - - 1.8.x - 1.9.x - tip go_import_path: github.com/purpleidea/mgmt @@ -19,7 +18,6 @@ matrix: fast_finish: false allow_failures: - go: tip - - go: 1.9.x - os: osx notifications: irc: diff --git a/docker/Dockerfile b/docker/Dockerfile index c3e03895..469f57be 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.8 +FROM golang:1.9 MAINTAINER Michał Czeraszkiewicz diff --git a/docker/Dockerfile.development b/docker/Dockerfile.development index 9803459e..0ebb94ef 100644 --- a/docker/Dockerfile.development +++ b/docker/Dockerfile.development @@ -1,4 +1,4 @@ -FROM golang:1.8 +FROM golang:1.9 MAINTAINER Michał Czeraszkiewicz diff --git a/docs/quick-start-guide.md b/docs/quick-start-guide.md index a98914a2..fdf422b2 100644 --- a/docs/quick-start-guide.md +++ b/docs/quick-start-guide.md @@ -11,7 +11,7 @@ Once you're familiar with the general idea, please start hacking... ## Quick start ### Installing golang -* You need golang version 1.8 or greater installed. +* You need golang version 1.9 or greater installed. ** To install on rpm style systems: `sudo dnf install golang` ** To install on apt style systems: `sudo apt install golang` ** To install on macOS systems install [Homebrew](https://brew.sh) and run: `brew install go` @@ -64,7 +64,7 @@ dependencies, _runtime_ dependencies, and additionally, a few extra dependencies required for running the _test_ suite. ### Build -* `golang` 1.8 or higher (required, available in some distros and distributed +* `golang` 1.9 or higher (required, available in some distros and distributed as a binary officially by [golang.org](https://golang.org/dl/)) ### Runtime diff --git a/prometheus/prometheus.go b/prometheus/prometheus.go index 70e4b839..3deaee90 100644 --- a/prometheus/prometheus.go +++ b/prometheus/prometheus.go @@ -144,7 +144,7 @@ func (obj *Prometheus) Start() error { // Stop the http server. func (obj *Prometheus) Stop() error { - // TODO: There is no way in go < 1.8 to stop a http server. + // FIXME: There is no way in go < 1.8 to stop a http server. Add this! // https://stackoverflow.com/questions/39320025/go-how-to-stop-http-listenandserve/41433555#41433555 return nil } diff --git a/vendor/github.com/coreos/etcd b/vendor/github.com/coreos/etcd index 589a7a19..c2360678 160000 --- a/vendor/github.com/coreos/etcd +++ b/vendor/github.com/coreos/etcd @@ -1 +1 @@ -Subproject commit 589a7a19ac469afa687ab1f7487dd5d4c2a6ee6a +Subproject commit c23606781f63d09917a1e7abfcefeb337a9608ea diff --git a/vendor/github.com/grpc-ecosystem/go-grpc-prometheus b/vendor/github.com/grpc-ecosystem/go-grpc-prometheus index 6b7015e6..0dafe0d4 160000 --- a/vendor/github.com/grpc-ecosystem/go-grpc-prometheus +++ b/vendor/github.com/grpc-ecosystem/go-grpc-prometheus @@ -1 +1 @@ -Subproject commit 6b7015e65d366bf3f19b2b2a000a831940f0f7e0 +Subproject commit 0dafe0d496ea71181bf2dd039e7e3f44b6bd11a7 diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway b/vendor/github.com/grpc-ecosystem/grpc-gateway index 18d15969..8cc3a55a 160000 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway @@ -1 +1 @@ -Subproject commit 18d159699f2e83fc5bb9ef2f79465ca3f3122676 +Subproject commit 8cc3a55af3bcf171a1c23a90c4df9cf591706104 diff --git a/vendor/github.com/ugorji/go b/vendor/github.com/ugorji/go index 8c0409fc..bdcc60b4 160000 --- a/vendor/github.com/ugorji/go +++ b/vendor/github.com/ugorji/go @@ -1 +1 @@ -Subproject commit 8c0409fcbb70099c748d71f714529204975f6c3f +Subproject commit bdcc60b419d136a85cdf2e7cbcac34b3f1cd6e57 diff --git a/vendor/google.golang.org/grpc b/vendor/google.golang.org/grpc index b8669c35..5b3c4e85 160000 --- a/vendor/google.golang.org/grpc +++ b/vendor/google.golang.org/grpc @@ -1 +1 @@ -Subproject commit b8669c35455183da6d5c474ea6e72fbf55183274 +Subproject commit 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e