Update Go to v1.17

Signed-off-by: Aurel Canciu <aurelcanciu@gmail.com>

.github/actions/run-tests/Dockerfile

@@ -1,5 +1,5 @@
 ARG BASE_VARIANT=bullseye
-ARG GO_VERSION=1.16.8
+ARG GO_VERSION=1.17.2
 ARG XX_VERSION=1.0.0-rc.2
 
 ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2

Dockerfile

@@ -1,5 +1,5 @@
 ARG BASE_VARIANT=bullseye
-ARG GO_VERSION=1.16.8
+ARG GO_VERSION=1.17.2
 ARG XX_VERSION=1.0.0-rc.2
 
 ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2
@@ -9,7 +9,6 @@ FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
 FROM ${LIBGIT2_IMG}:${LIBGIT2_TAG} as libgit2
 
 FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} as gostable
-FROM --platform=$BUILDPLATFORM golang:1.17rc1-${BASE_VARIANT} AS golatest
 
 FROM gostable AS go-linux
 

api/go.mod

@@ -1,9 +1,25 @@
 module github.com/fluxcd/source-controller/api
 
-go 1.16
+go 1.17
 
 require (
  github.com/fluxcd/pkg/apis/meta v0.10.0
  k8s.io/apimachinery v0.21.3
  sigs.k8s.io/controller-runtime v0.9.5
 )
+
+require (
+ github.com/go-logr/logr v0.4.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/json-iterator/go v1.1.11 // indirect
+ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+ github.com/modern-go/reflect2 v1.0.1 // indirect
+ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect
+ golang.org/x/text v0.3.6 // indirect
+ gopkg.in/inf.v0 v0.9.1 // indirect
+ gopkg.in/yaml.v2 v2.4.0 // indirect
+ k8s.io/klog/v2 v2.8.0 // indirect
+ sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
+)

go.mod

@@ -1,11 +1,10 @@
 module github.com/fluxcd/source-controller
 
-go 1.16
+go 1.17
 
 replace github.com/fluxcd/source-controller/api => ./api
 
 require (
- cloud.google.com/go v0.93.3 // indirect
  cloud.google.com/go/storage v1.16.0
  github.com/Masterminds/semver/v3 v3.1.1
  github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7
@@ -23,35 +22,178 @@ require (
  github.com/go-git/go-billy/v5 v5.3.1
  github.com/go-git/go-git/v5 v5.4.2
  github.com/go-logr/logr v0.4.0
- github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
- github.com/googleapis/gax-go/v2 v2.1.0 // indirect
  github.com/libgit2/git2go/v31 v31.6.1
  github.com/minio/minio-go/v7 v7.0.10
  github.com/onsi/ginkgo v1.16.4
- github.com/onsi/gomega v1.14.0
+ github.com/onsi/gomega v1.15.0
  github.com/spf13/pflag v1.0.5
- golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b
+ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
+ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
+ google.golang.org/api v0.54.0
+ gotest.tools v2.2.0+incompatible
+ helm.sh/helm/v3 v3.7.1
+ k8s.io/api v0.22.2
+ k8s.io/apimachinery v0.22.2
+ k8s.io/client-go v0.22.2
+ sigs.k8s.io/controller-runtime v0.10.1
+ sigs.k8s.io/yaml v1.3.0
+)
+
+require (
+ cloud.google.com/go v0.93.3 // indirect
+ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
+ github.com/BurntSushi/toml v0.3.1 // indirect
+ github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
+ github.com/Masterminds/goutils v1.1.1 // indirect
+ github.com/Masterminds/sprig/v3 v3.2.2 // indirect
+ github.com/Masterminds/squirrel v1.5.0 // indirect
+ github.com/Microsoft/go-winio v0.4.17 // indirect
+ github.com/Microsoft/hcsshim v0.8.21 // indirect
+ github.com/PuerkitoBio/purell v1.1.1 // indirect
+ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+ github.com/acomagu/bufpipe v1.0.3 // indirect
+ github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
+ github.com/beorn7/perks v1.0.1 // indirect
+ github.com/cespare/xxhash/v2 v2.1.1 // indirect
+ github.com/containerd/containerd v1.5.7 // indirect
+ github.com/containerd/continuity v0.1.0 // indirect
+ github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/docker/cli v20.10.7+incompatible // indirect
+ github.com/docker/distribution v2.7.1+incompatible // indirect
+ github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible // indirect
+ github.com/docker/docker-credential-helpers v0.6.3 // indirect
+ github.com/docker/go-connections v0.4.0 // indirect
+ github.com/docker/go-metrics v0.0.1 // indirect
+ github.com/docker/go-units v0.4.0 // indirect
+ github.com/emirpasic/gods v1.12.0 // indirect
+ github.com/evanphx/json-patch v4.11.0+incompatible // indirect
+ github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
+ github.com/fatih/color v1.7.0 // indirect
+ github.com/fluxcd/pkg/testserver v0.1.0 // indirect
+ github.com/fsnotify/fsnotify v1.4.9 // indirect
+ github.com/go-errors/errors v1.0.1 // indirect
+ github.com/go-git/gcfg v1.5.0 // indirect
+ github.com/go-logr/zapr v0.4.0 // indirect
+ github.com/go-openapi/jsonpointer v0.19.5 // indirect
+ github.com/go-openapi/jsonreference v0.19.5 // indirect
+ github.com/go-openapi/swag v0.19.14 // indirect
+ github.com/gobwas/glob v0.2.3 // indirect
+ github.com/gogo/protobuf v1.3.2 // indirect
+ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+ github.com/golang/protobuf v1.5.2 // indirect
+ github.com/google/btree v1.0.1 // indirect
+ github.com/google/go-cmp v0.5.6 // indirect
+ github.com/google/gofuzz v1.1.0 // indirect
+ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
+ github.com/google/uuid v1.2.0 // indirect
+ github.com/googleapis/gax-go/v2 v2.1.0 // indirect
+ github.com/googleapis/gnostic v0.5.5 // indirect
+ github.com/gorilla/mux v1.8.0 // indirect
+ github.com/gosuri/uitable v0.0.4 // indirect
+ github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
+ github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
+ github.com/hashicorp/go-retryablehttp v0.6.8 // indirect
+ github.com/huandu/xstrings v1.3.2 // indirect
+ github.com/imdario/mergo v0.3.12 // indirect
+ github.com/inconshreveable/mousetrap v1.0.0 // indirect
+ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+ github.com/jmoiron/sqlx v1.3.1 // indirect
+ github.com/josharian/intern v1.0.0 // indirect
+ github.com/json-iterator/go v1.1.11 // indirect
+ github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
+ github.com/klauspost/compress v1.11.13 // indirect
+ github.com/klauspost/cpuid v1.3.1 // indirect
+ github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
+ github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
+ github.com/lib/pq v1.10.0 // indirect
+ github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
+ github.com/mailru/easyjson v0.7.6 // indirect
+ github.com/mattn/go-colorable v0.0.9 // indirect
+ github.com/mattn/go-isatty v0.0.4 // indirect
+ github.com/mattn/go-runewidth v0.0.9 // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+ github.com/minio/md5-simd v1.1.0 // indirect
+ github.com/minio/sha256-simd v0.1.1 // indirect
+ github.com/mitchellh/copystructure v1.1.1 // indirect
+ github.com/mitchellh/go-homedir v1.1.0 // indirect
+ github.com/mitchellh/go-wordwrap v1.0.0 // indirect
+ github.com/mitchellh/reflectwalk v1.0.1 // indirect
+ github.com/moby/locker v1.0.1 // indirect
+ github.com/moby/spdystream v0.2.0 // indirect
+ github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
+ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+ github.com/modern-go/reflect2 v1.0.1 // indirect
+ github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // 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.1 // indirect
+ github.com/opencontainers/runc v1.0.2 // indirect
+ github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
+ github.com/pkg/errors v0.9.1 // indirect
+ github.com/pmezard/go-difflib v1.0.0 // indirect
+ github.com/prometheus/client_golang v1.11.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/rs/xid v1.2.1 // indirect
+ github.com/rubenv/sql-migrate v0.0.0-20210614095031-55d5740dbbcc // indirect
+ github.com/russross/blackfriday v1.5.2 // indirect
+ github.com/satori/go.uuid v1.2.0 // indirect
+ github.com/sergi/go-diff v1.1.0 // indirect
+ github.com/shopspring/decimal v1.2.0 // indirect
+ github.com/sirupsen/logrus v1.8.1 // indirect
+ github.com/sosedoff/gitkit v0.2.1-0.20200818155723-72ebbcf5056d // indirect
+ github.com/spf13/cast v1.3.1 // indirect
+ github.com/spf13/cobra v1.2.1 // indirect
+ github.com/stretchr/testify v1.7.0 // indirect
+ github.com/xanzy/ssh-agent v0.3.0 // indirect
+ github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
+ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
+ github.com/xeipuuv/gojsonschema v1.2.0 // indirect
+ github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
+ go.opencensus.io v0.23.0 // indirect
+ go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
+ go.uber.org/atomic v1.7.0 // indirect
+ go.uber.org/multierr v1.6.0 // indirect
+ go.uber.org/zap v1.19.0 // indirect
  golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
  golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
- golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
  golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
+ golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
  golang.org/x/text v0.3.7 // indirect
- google.golang.org/api v0.54.0
+ golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+ gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
+ google.golang.org/appengine v1.6.7 // indirect
  google.golang.org/genproto v0.0.0-20210830153122-0bac4d21c8ea // indirect
- gotest.tools v2.2.0+incompatible
- helm.sh/helm/v3 v3.6.3
- k8s.io/api v0.21.3
- k8s.io/apimachinery v0.21.3
- k8s.io/client-go v0.21.3
- sigs.k8s.io/controller-runtime v0.9.5
- sigs.k8s.io/yaml v1.2.0
+ google.golang.org/grpc v1.40.0 // indirect
+ google.golang.org/protobuf v1.27.1 // indirect
+ gopkg.in/gorp.v1 v1.7.2 // indirect
+ gopkg.in/inf.v0 v0.9.1 // indirect
+ gopkg.in/ini.v1 v1.62.0 // indirect
+ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+ gopkg.in/warnings.v0 v0.1.2 // indirect
+ gopkg.in/yaml.v2 v2.4.0 // indirect
+ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+ k8s.io/apiextensions-apiserver v0.22.2 // indirect
+ k8s.io/apiserver v0.22.2 // indirect
+ k8s.io/cli-runtime v0.22.1 // indirect
+ k8s.io/component-base v0.22.2 // indirect
+ k8s.io/klog/v2 v2.9.0 // indirect
+ k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
+ k8s.io/kubectl v0.22.1 // indirect
+ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
+ oras.land/oras-go v0.4.0 // indirect
+ sigs.k8s.io/kustomize/api v0.8.11 // indirect
+ sigs.k8s.io/kustomize/kyaml v0.11.0 // indirect
+ sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
 )
 
 // required by https://github.com/helm/helm/blob/v3.6.0/go.mod
 replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
 
 // fix CVE-2021-41103
-replace github.com/containerd/containerd => github.com/containerd/containerd v1.4.11
+replace github.com/containerd/containerd => github.com/containerd/containerd v1.5.7
 
 // fix CVE-2021-30465
 replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc95