Merge pull request #2081 from dashpole/go_1.11

Update formatting for go 1.11

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

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,

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):
 

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 {

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,
 		}
 	}