Merge pull request #1168 from camilamacedo86/ci

Fix CI

CONTRIBUTING.md

@@ -7,8 +7,8 @@ Kubernetes projects require that you sign a Contributor License Agreement (CLA)
 Please see https://git.k8s.io/community/CLA.md for more info.
 
 ## Prerequisites
-- [go](https://golang.org/dl/) version v1.12+.
-- [dep](https://github.com/golang/dep) dep v0.5.1+ < v.0.5.4
+- [go](https://golang.org/dl/) version v1.13+.
+- [dep](https://github.com/golang/dep) dep v0.5+
 - [docker](https://docs.docker.com/install/) version 17.03+.
 - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) version v1.11.3+.
 - [kustomize](https://sigs.k8s.io/kustomize/docs/INSTALL.md) v3.1.0+
@@ -33,7 +33,7 @@ $ git clone git@github.com:<user>/kubebuilder.git $GOPATH/src/sigs.k8s.io/kubebu
 1. Build the project by using the command `make build` 
 1. Run the tests by using the command `make test`
 1. Run the command `make install` to create a bin with the source code 
-1. Run the script `./generated_golden.sh` to update/generate the mock data used in the e2e test in `$GOPATH/src/sigs.k8s.io/kubebuilder/testdata/`
+1. Run the script `make generate` to update/generate the mock data used in the e2e test in `$GOPATH/src/sigs.k8s.io/kubebuilder/testdata/`
 
 ## Community, discussion and support
 

Makefile

@@ -45,9 +45,9 @@ install: ## Build and install the binary with the current source code. Use it to
 
 .PHONY: generate
 generate: ## Update/generate all mock data. You should run this commands to update the mock data after your changes.
-	make generate-vendor
 	make generate-setup
 	make generate-testdata
+	go mod tidy
 
 .PHONY: generate-testdata
 generate-testdata: ## Update/generate the testdata in $GOPATH/src/sigs.k8s.io/kubebuilder

pkg/scaffold/v2/dockerfile.go

@@ -37,7 +37,7 @@ func (c *Dockerfile) GetInput() (input.Input, error) {
 }
 
 var dockerfileTemplate = `# Build the manager binary
-FROM golang:1.12.5 as builder
+FROM golang:1.13 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

testdata/project-v2/Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.12.5 as builder
+FROM golang:1.13 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests