diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16e946ee..10c4170c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,9 +13,9 @@ on: - v[1-9].* env: - BUILDTIME_BASE: "golang:1.16.9-alpine3.14" - RUNTIME_BASE: "alpine:3.14" - GO_VERSION: "~1.16.9" + BUILDTIME_BASE: "golang:1.17.5-alpine3.15" + RUNTIME_BASE: "alpine:3.15" + GO_VERSION: "~1.17.5" jobs: # Runs Golangci-lint on the source code diff --git a/Makefile b/Makefile index 1c83d81d..13c141c7 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ DOCKER=$(if $(or $(IN_DOCKER_GROUP),$(IS_ROOT),$(OSX)),docker,sudo docker) MAKEFILE_DIR=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) UPSTREAM_IMPORT_PATH=$(GOPATH)/src/github.com/cloudnativelabs/kube-router/ BUILD_IN_DOCKER?=true -DOCKER_BUILD_IMAGE?=golang:1.16.9-alpine3.14 +DOCKER_BUILD_IMAGE?=golang:1.17.5-alpine3.15 DOCKER_LINT_IMAGE?=golangci/golangci-lint:v1.42.1 GOBGP_VERSION=v0.0.0-20211201041502-6248c576b118 # v2.34.0 QEMU_IMAGE?=multiarch/qemu-user-static diff --git a/go.mod b/go.mod index 4e547d8c..42951416 100644 --- a/go.mod +++ b/go.mod @@ -2,20 +2,14 @@ module github.com/cloudnativelabs/kube-router require ( github.com/aws/aws-sdk-go v1.42.20 - github.com/containerd/containerd v1.5.4 // indirect github.com/containernetworking/cni v1.0.1 github.com/containernetworking/plugins v1.0.1 github.com/coreos/go-iptables v0.6.0 - github.com/docker/distribution v2.7.1+incompatible // indirect github.com/docker/docker v20.10.11+incompatible - github.com/docker/go-connections v0.4.0 // indirect github.com/golang/protobuf v1.5.2 - github.com/gorilla/mux v1.8.0 // indirect github.com/moby/ipvs v1.0.1 - github.com/morikuni/aec v1.0.0 // indirect github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.17.0 - github.com/opencontainers/image-spec v1.0.2 // indirect github.com/osrg/gobgp v0.0.0-20211201041502-6248c576b118 github.com/prometheus/client_golang v1.11.0 github.com/spf13/pflag v1.0.5 @@ -31,8 +25,75 @@ require ( k8s.io/klog/v2 v2.30.0 ) +require ( + github.com/Microsoft/go-winio v0.4.17 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/containerd/containerd v1.5.4 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect + github.com/docker/distribution v2.7.1+incompatible // indirect + github.com/docker/go-connections v0.4.0 // indirect + github.com/docker/go-units v0.4.0 // indirect + github.com/eapache/channels v1.1.0 // indirect + github.com/eapache/queue v1.1.0 // indirect + github.com/evanphx/json-patch v4.11.0+incompatible // indirect + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/go-logr/logr v1.2.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/go-cmp v0.5.5 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect + github.com/gorilla/mux v1.8.0 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/json-iterator/go v1.1.11 // indirect + github.com/k-sone/critbitgo v1.4.0 // indirect + github.com/magiconair/properties v1.8.1 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/mitchellh/mapstructure v1.1.2 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/morikuni/aec v1.0.0 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.0.2 // indirect + github.com/pelletier/go-toml v1.8.1 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.26.0 // indirect + github.com/prometheus/procfs v0.6.0 // indirect + github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1 // indirect + github.com/sirupsen/logrus v1.8.1 // indirect + github.com/spf13/afero v1.2.2 // indirect + github.com/spf13/cast v1.3.0 // indirect + github.com/spf13/jwalterweatherman v1.0.0 // indirect + github.com/spf13/viper v1.7.1 // indirect + github.com/subosito/gotenv v1.2.0 // indirect + golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect + golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect + golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect + golang.org/x/text v0.3.6 // indirect + golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect + google.golang.org/appengine v1.6.5 // indirect + google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect + google.golang.org/protobuf v1.27.1 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/ini.v1 v1.51.0 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c // indirect + k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect +) + replace github.com/containerd/containerd => github.com/containerd/containerd v1.5.8 // CVE-2021-32760 & CVE-2021-41103 replace github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2 // CVE-2021-41190 -go 1.16 +go 1.17