Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #222

Merged
merged 7 commits into from
Jan 7, 2021
Merged

Update dependencies #222

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
29610db
update deps
Jan 5, 2021
4e26e02
update deps
Jan 6, 2021
02c062d
refactor
Jan 6, 2021
d9fce60
golang 1.14
Jan 6, 2021
ebea0d0
update controller-gen to 0.4.1
Jan 6, 2021
c64c457
Merge branch 'master' into update-deps
eytan-avisror Jan 7, 2021
f2b36fb
merge fixes
Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.13.10 as builder
FROM golang:1.14 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export GO111MODULE=on

CONTROLLER_GEN_VERSION := v0.2.9
CONTROLLER_GEN_VERSION := v0.4.1
GO_MIN_VERSION := 11100 # go1.11

define generate_int_from_semver
Expand Down Expand Up @@ -42,7 +42,7 @@ test: generate fmt vet manifests

.PHONY: bdd
bdd:
go test -timeout 60m -v ./test-bdd/ --godog.stop-on-failure
go test -timeout 60m -v ./test-bdd/ --godog.stop-on-failure

.PHONY: wip
wip:
Expand Down Expand Up @@ -122,7 +122,7 @@ check-controller-gen:
controller-gen: controller-gen-find check-controller-gen

.PHONY: controller-gen-real
controller-gen-find:
controller-gen-find:
ifeq (, $(shell which controller-gen))
go get sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_GEN_VERSION)
CONTROLLER_GEN=$(shell go env GOPATH)/bin/controller-gen
Expand Down
Loading