From d44ade2927ceea427233adf9e2cc0ddb44bee191 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Tue, 23 Oct 2018 11:28:14 -0700 Subject: [PATCH] make formatting compatible with 1.11, and revert #2056 --- deploy/canary/Dockerfile | 2 +- devicemapper/thin_pool_watcher_test.go | 4 ++-- docs/development/build.md | 2 +- pages/containers.go | 2 +- pages/docker.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deploy/canary/Dockerfile b/deploy/canary/Dockerfile index 2259616c..8b45ea21 100644 --- a/deploy/canary/Dockerfile +++ b/deploy/canary/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.10 +FROM golang:1.11 MAINTAINER vmarmol@google.com RUN apt-get update && apt-get install -y git dmsetup && apt-get clean diff --git a/devicemapper/thin_pool_watcher_test.go b/devicemapper/thin_pool_watcher_test.go index 2a598fac..a60727c6 100644 --- a/devicemapper/thin_pool_watcher_test.go +++ b/devicemapper/thin_pool_watcher_test.go @@ -61,8 +61,8 @@ func TestRefresh(t *testing.T) { name: "no existing reservation - ok", dmsetupCommands: []fake.DmsetupCommand{ {Name: "status", Result: "0 75497472 thin-pool 65 327/524288 14092/589824 - rw no_discard_passdown error_if_no_space - ", Err: nil}, // status check - {Name: "message", Result: "", Err: nil}, // make reservation - {Name: "message", Result: "", Err: nil}, // release reservation + {Name: "message", Result: "", Err: nil}, // make reservation + {Name: "message", Result: "", Err: nil}, // release reservation }, thinLsOutput: usage, expectedError: false, diff --git a/docs/development/build.md b/docs/development/build.md index 1a7a9eea..a4ae8eaf 100644 --- a/docs/development/build.md +++ b/docs/development/build.md @@ -6,7 +6,7 @@ cAdvisor is written in the [Go](http://golang.org) programming language. If you haven't set up a Go development environment, please follow [these instructions](http://golang.org/doc/code.html) to install go tool and set up GOPATH. Note that the version of Go in package repositories of some operating systems is outdated, so please [download](https://golang.org/dl/) the latest version. -**Note**: cAdvisor requires Go 1.10 to build. +**Note**: cAdvisor requires Go 1.11 to build. After setting up Go, you should be able to `go get` cAdvisor as expected (we use `-d` to only download): diff --git a/pages/containers.go b/pages/containers.go index 8f298152..29626c98 100644 --- a/pages/containers.go +++ b/pages/containers.go @@ -235,7 +235,7 @@ func serveContainersPage(m manager.Manager, w http.ResponseWriter, u *url.URL) { FsAvailable: cont.Spec.HasFilesystem, CustomMetricsAvailable: cont.Spec.HasCustomMetrics, SubcontainersAvailable: len(subcontainerLinks) > 0, - Root: rootDir, + Root: rootDir, } err = pageTemplate.Execute(w, data) if err != nil { diff --git a/pages/docker.go b/pages/docker.go index 4fb2f6bc..f939d46f 100644 --- a/pages/docker.go +++ b/pages/docker.go @@ -148,7 +148,7 @@ func serveDockerPage(m manager.Manager, w http.ResponseWriter, u *url.URL) { NetworkAvailable: cont.Spec.HasNetwork, FsAvailable: cont.Spec.HasFilesystem, CustomMetricsAvailable: cont.Spec.HasCustomMetrics, - Root: rootDir, + Root: rootDir, } }