Merge pull request #1075 from krancour/dependency-updates

Dependency updates

Makefile

@@ -24,7 +24,9 @@ CLIENT_ARCH ?= $(shell go env GOARCH)
 
 ifneq ($(SKIP_DOCKER),true)
 	PROJECT_ROOT := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-	GO_DEV_IMAGE := quay.io/deis/lightweight-docker-go:v0.7.0
+	# https://github.com/krancour/go-tools
+	# https://hub.docker.com/repository/docker/krancour/go-tools
+	GO_DEV_IMAGE := krancour/go-tools:v0.1.0
 	JS_DEV_IMAGE := node:12.3.1-stretch
 
 	GO_DOCKER_CMD := docker run \
@@ -77,9 +79,9 @@ IMMUTABLE_DOCKER_TAG := $(VERSION)
 # Utility targets                                                              #
 ################################################################################
 
-.PHONY: dep
-dep:
-	$(GO_DOCKER_CMD) dep ensure -v
+.PHONY: resolve-dependencies
+resolve-dependencies:
+	$(GO_DOCKER_CMD) sh -c 'go mod tidy && go vendor'
 
 .PHONY: format
 format: format-go format-js
@@ -112,7 +114,7 @@ test: verify-vendored-code lint test-unit verify-vendored-code-js test-js
 # tracked, vendored dependencies
 .PHONY: verify-vendored-code
 verify-vendored-code:
-	$(GO_DOCKER_CMD) dep check
+	$(GO_DOCKER_CMD) go mod verify
 
 .PHONY: lint
 lint:

brig/Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/deis/lightweight-docker-go:v0.7.0
+FROM krancour/go-tools:v0.1.0
 ARG LDFLAGS
 ENV CGO_ENABLED=0
 WORKDIR /go/src/github.com/brigadecore/brigade

brig/cmd/brig/commands/build_list_test.go

@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"context"
 	"testing"
 	"time"
 
@@ -141,7 +142,7 @@ func TestGetBuildListCountTwo(t *testing.T) {
 // Build3 started 3 minutes ago and finished 1 minute ago and belongs to a different project than build1 and build2
 func createFakeBuilds(t *testing.T, client kubernetes.Interface) {
 	stubProject1Secret := createStubProjectSecret(stubProject1ID)
-	_, err := client.CoreV1().Secrets("default").Create(stubProject1Secret)
+	_, err := client.CoreV1().Secrets("default").Create(context.TODO(), stubProject1Secret, metav1.CreateOptions{})
 	if err != nil {
 		t.Error(err)
 	}
@@ -161,11 +162,11 @@ func createFakeBuilds(t *testing.T, client kubernetes.Interface) {
 			},
 		},
 	})
-	_, err = client.CoreV1().Pods("default").Create(stubWorker1Pod)
+	_, err = client.CoreV1().Pods("default").Create(context.TODO(), stubWorker1Pod, metav1.CreateOptions{})
 	if err != nil {
 		t.Error(err)
 	}
-	_, err = client.CoreV1().Secrets("default").Create(stubBuild1Secret)
+	_, err = client.CoreV1().Secrets("default").Create(context.TODO(), stubBuild1Secret, metav1.CreateOptions{})
 	if err != nil {
 		t.Error(err)
 	}
@@ -184,11 +185,11 @@ func createFakeBuilds(t *testing.T, client kubernetes.Interface) {
 			},
 		},
 	})
-	_, err = client.CoreV1().Pods("default").Create(stubWorker2Pod)
+	_, err = client.CoreV1().Pods("default").Create(context.TODO(), stubWorker2Pod, metav1.CreateOptions{})
 	if err != nil {
 		t.Error(err)
 	}
-	_, err = client.CoreV1().Secrets("default").Create(stubBuild2Secret)
+	_, err = client.CoreV1().Secrets("default").Create(context.TODO(), stubBuild2Secret, metav1.CreateOptions{})
 	if err != nil {
 		t.Error(err)
 	}
@@ -208,11 +209,11 @@ func createFakeBuilds(t *testing.T, client kubernetes.Interface) {
 			},
 		},
 	})
-	_, err = client.CoreV1().Pods("default").Create(stubWorker3Pod)
+	_, err = client.CoreV1().Pods("default").Create(context.TODO(), stubWorker3Pod, metav1.CreateOptions{})
 	if err != nil {
 		t.Error(err)
 	}
-	_, err = client.CoreV1().Secrets("default").Create(stubBuild3Secret)
+	_, err = client.CoreV1().Secrets("default").Create(context.TODO(), stubBuild3Secret, metav1.CreateOptions{})
 	if err != nil {
 		t.Error(err)
 	}

brig/cmd/brig/commands/check.go

@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
@@ -46,7 +47,7 @@ func checkBrigadeSystem() error {
 	}
 
 	// check deployments
-	deployList, err := c.AppsV1().Deployments(globalNamespace).List(meta_v1.ListOptions{})
+	deployList, err := c.AppsV1().Deployments(globalNamespace).List(context.TODO(), meta_v1.ListOptions{})
 	if err != nil {
 		return err
 	}
@@ -85,7 +86,7 @@ func checkBrigadeSystem() error {
 	}
 
 	// check vacuum cronjob
-	cjList, err := c.BatchV1beta1().CronJobs(globalNamespace).List(meta_v1.ListOptions{})
+	cjList, err := c.BatchV1beta1().CronJobs(globalNamespace).List(context.TODO(), meta_v1.ListOptions{})
 	if err != nil {
 		return err
 	}

brigade-api/Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/deis/lightweight-docker-go:v0.7.0
+FROM krancour/go-tools:v0.1.0
 ARG LDFLAGS
 ENV CGO_ENABLED=0
 WORKDIR /go/src/github.com/brigadecore/brigade

brigade-controller/Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/deis/lightweight-docker-go:v0.7.0
+FROM krancour/go-tools:v0.1.0
 ARG LDFLAGS
 ENV CGO_ENABLED=0
 WORKDIR /go/src/github.com/brigadecore/brigade