Skip to content

Commit

Permalink
Update third-party dependencies and use Go 1.14 (#1456)
Browse files Browse the repository at this point in the history
Signed-off-by: Jan Schlicht <jan@d2iq.com>
  • Loading branch information
Jan Schlicht committed Apr 14, 2020
1 parent bf5c090 commit 9eaad41
Show file tree
Hide file tree
Showing 8 changed files with 66 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

lint:
docker:
- image: kudobuilder/golang:1.13
- image: kudobuilder/golang:1.14
working_directory: /go/src/github.com/kudobuilder/kudo
steps:
- checkout
Expand Down
2 changes: 1 addition & 1 deletion Dispatchfile.cue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ task "test": {
steps: [
{
name: "test"
image: "kudobuilder/golang:1.13"
image: "kudobuilder/golang:1.14"
command: [ "make", "test" ],
workingDir: "/workspace/src-git"
}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.13 as builder
FROM golang:1.14 as builder

# Setting arguments
ARG ldflags_arg
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GOLANG_VERSION=1.13
ARG GOLANG_VERSION=1.14
FROM golang:${GOLANG_VERSION}
ARG KUBEBUILDER_VERSION=2.1.0

Expand Down
4 changes: 2 additions & 2 deletions build/test-images.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

docker build --build-arg GOLANG_VERSION=1.13 -t kudobuilder/golang:1.13 .
docker push kudobuilder/golang:1.13
docker build --build-arg GOLANG_VERSION=1.14 -t kudobuilder/golang:1.14 .
docker push kudobuilder/golang:1.14

docker build --build-arg GOLANG_VERSION=latest -t kudobuilder/golang:latest .
docker push kudobuilder/golang:latest
21 changes: 11 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/kudobuilder/kudo

go 1.13
go 1.14

require (
github.com/Masterminds/semver v1.5.0
Expand All @@ -9,17 +9,18 @@ require (
github.com/gosuri/uitable v0.0.4
github.com/kudobuilder/kuttl v0.1.0
github.com/manifoldco/promptui v0.6.0
github.com/onsi/ginkgo v1.11.0
github.com/onsi/gomega v1.8.1
github.com/prometheus/common v0.4.1
github.com/onsi/ginkgo v1.12.0
github.com/onsi/gomega v1.9.0
github.com/spf13/afero v1.2.2
github.com/spf13/cobra v0.0.5
github.com/spf13/cobra v0.0.7
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.4.0
github.com/thoas/go-funk v0.5.0
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
github.com/stretchr/testify v1.5.1
github.com/thoas/go-funk v0.6.0
github.com/xlab/treeprint v1.0.0
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a
golang.org/x/sys v0.0.0-20200408040146-ea54a3c99b9b // indirect
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
gopkg.in/yaml.v2 v2.2.8
gotest.tools v2.2.0+incompatible
k8s.io/api v0.17.3
Expand Down
50 changes: 48 additions & 2 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM kudobuilder/golang:1.13
FROM kudobuilder/golang:1.14

WORKDIR $GOPATH/src/github.com/kudobuilder/kudo

Expand Down

0 comments on commit 9eaad41

Please sign in to comment.