update scripts and docs to not mention godep for builds

Signed-off-by: Vishnu kannan <[email protected]>

Makefile

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 
-GO := godep go
+GO := go
 pkgs  = $(shell $(GO) list ./...)
 
 all: format build test

build/boilerplate/boilerplate.py

@@ -95,7 +95,7 @@ def file_passes(filename, refs, regexs):
 def file_extension(filename):
     return os.path.splitext(filename)[1].split(".")[-1].lower()
 
-skipped_dirs = ['Godeps', 'third_party', '_gopath', '_output', '.git']
+skipped_dirs = ['Godeps', 'vendor', 'third_party', '_gopath', '_output', '.git']
 def normalize_files(files):
     newfiles = []
     for pathname in files:

build/build.sh

@@ -68,6 +68,6 @@ if [ "$RELEASE" == "true" ]; then
   echo "Building release candidate with -ldflags $ldflags"
 fi
 
-GOBIN=$PWD godep go "$GO_CMD" ${GO_FLAGS} -ldflags "${ldflags}" "${repo_path}"
+GOBIN=$PWD go "$GO_CMD" ${GO_FLAGS} -ldflags "${ldflags}" "${repo_path}"
 
 exit 0

build/check_errorf.sh

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-GO_FILES=$(find . -not -wholename "*Godeps*" -name "*.go")
+GO_FILES=$(find . -not -wholename "*Godeps*" -not -wholename "*vendor*" -name "*.go")
 
 for FILE in ${GO_FILES}; do
 	ERRS=`grep 'fmt.Errorf("[A-Z]' ${FILE}`

build/check_gofmt.sh

@@ -21,7 +21,7 @@ if [ $# -ne 1 ]; then
 fi
 
 # Check formatting on non Godep'd code.
-GOFMT_PATHS=$(find . -not -wholename "*.git*" -not -wholename "*Godeps*" -not -name "." -type d)
+GOFMT_PATHS=$(find . -not -wholename "*.git*" -not -wholename "*Godeps*" -not -wholename "*vendor*" -not -name "." -type d)
 
 # Find any files with gofmt problems
 BAD_FILES=$(gofmt -s -l $GOFMT_PATHS)

build/integration.sh

@@ -57,4 +57,4 @@ while [ "$(curl -Gs http://localhost:8080/healthz)" != "ok" ]; do
 done
 
 echo ">> running integration tests against local cAdvisor"
-godep go test github.com/google/cadvisor/integration/tests/... --vmodule=*=2
+go test github.com/google/cadvisor/integration/tests/... --vmodule=*=2

build/jenkins_e2e.sh

@@ -22,9 +22,8 @@ BUILDER=${BUILDER:-false} # Whether this is running a PR builder job.
 export GO_FLAGS="-race"
 export GORACE="halt_on_error=1"
 
-go get -u github.com/tools/godep
 ./build/presubmit.sh
-godep go build -tags test github.com/google/cadvisor/integration/runner
+go build -tags test github.com/google/cadvisor/integration/runner
 
 # Nodes that are currently stable. When tests fail on a specific node, and the failure is not remedied within a week, that node will be removed from this list.
 golden_nodes=(

build/presubmit.sh

@@ -20,5 +20,5 @@ set -x
 ./build/check_gofmt.sh .
 ./build/check_boilerplate.sh
 go vet github.com/google/cadvisor/...
-godep go test -v -race -test.short github.com/google/cadvisor/...
-godep go build github.com/google/cadvisor
+go test -v -race -test.short github.com/google/cadvisor/...
+go build github.com/google/cadvisor

deploy/build.sh

@@ -17,6 +17,6 @@
 set -e
 set -x
 
-godep go build -a github.com/google/cadvisor
+make
 
 docker build -t google/cadvisor:beta .

deploy/canary/Dockerfile

@@ -3,8 +3,7 @@ MAINTAINER [email protected]
 
 RUN apt-get install -y git dmsetup
 RUN git clone https://github.com/google/cadvisor.git /go/src/github.com/google/cadvisor
-RUN go get github.com/tools/godep
-RUN cd /go/src/github.com/google/cadvisor && godep go build .
+RUN cd /go/src/github.com/google/cadvisor && make
 
 ENTRYPOINT ["/go/src/github.com/google/cadvisor/cadvisor"]
 

docs/development/build.md

@@ -14,24 +14,18 @@ After setting up Go, you should be able to `go get` cAdvisor as expected (we use
 $ go get -d github.com/google/cadvisor
 ```
 
-We use `godep` so you will need to get that as well:
-
-```
-$ go get github.com/tools/godep
-```
-
 ## Building from Source
 
 At this point you can build cAdvisor from the source folder:
 
 ```
-$GOPATH/src/github.com/google/cadvisor $ godep go build .
+$GOPATH/src/github.com/google/cadvisor $ make
 ```
 
 or run only unit tests:
 
 ```
-$GOPATH/src/github.com/google/cadvisor $ godep go test ./... -test.short
+$GOPATH/src/github.com/google/cadvisor $ make test
 ```
 
 For integration tests, see the [integration testing](integration_testing.md) page.
@@ -50,6 +44,6 @@ If you modify files in the /assets folder, you will need to rebuild the assets:
 
 ```
 $GOPATH/src/github.com/google/cadvisor $ ./build/assets.sh
-$GOPATH/src/github.com/google/cadvisor $ godep go build .
+$GOPATH/src/github.com/google/cadvisor $ make
 ```
 

docs/development/integration_testing.md

@@ -3,15 +3,15 @@
 The cAdvisor integration tests can be found in `integration/tests`. These run queries on a running cAdvisor. To run these tests:
 
 ```
-$ godep go run integration/runner/runner.go -port=PORT <hosts to test>
+$ go run integration/runner/runner.go -port=PORT <hosts to test>
 ```
 
 This will build a cAdvisor from the current repository and start it on the target machine before running the tests.
 
 To simply run the tests against an existing cAdvisor:
 
 ```
-$ godep go test github.com/google/cadvisor/integration/tests/... -host=HOST -port=PORT
+$ go test github.com/google/cadvisor/integration/tests/... -host=HOST -port=PORT
 ```
 
 Note that `HOST` and `PORT` default to `localhost` and `8080` respectively.

integration/runner/run.sh

@@ -30,7 +30,7 @@ if ! git diff --name-only origin/master | grep -c -E "*.go|*.sh" &> /dev/null; t
 fi
 
 # Build the runner.
-godep go build github.com/google/cadvisor/integration/runner
+go build github.com/google/cadvisor/integration/runner
 
 # Run it.
 HOSTS=$@

integration/runner/runner.go

@@ -37,7 +37,7 @@ import (
 )
 
 // must be able to ssh into hosts without password
-// godep go run ./integration/runner/runner.go --logtostderr --v 2 --ssh-config <.ssh/config file> <list of hosts>
+// go run ./integration/runner/runner.go --logtostderr --v 2 --ssh-config <.ssh/config file> <list of hosts>
 
 const (
 	cadvisorBinary = "cadvisor"
@@ -180,7 +180,7 @@ func PushAndRunTests(host, testDir string) (result error) {
 		}
 		// Run the command
 
-		err = RunCommand("godep", "go", "test", "--timeout", testTimeout.String(), "github.com/google/cadvisor/integration/tests/...", "--host", host, "--port", portStr, "--ssh-options", *sshOptions)
+		err = RunCommand("go", "test", "--timeout", testTimeout.String(), "github.com/google/cadvisor/integration/tests/...", "--host", host, "--port", portStr, "--ssh-options", *sshOptions)
 		if err == nil {
 			// On success, break out of retry loop
 			break