Skip to content

Commit e3d04b3

Browse files
relurelu
committed
Update Go to v1.17
Signed-off-by: Aurel Canciu <[email protected]>
1 parent 1475eca commit e3d04b3

File tree

5 files changed

+197
-38
lines changed

5 files changed

+197
-38
lines changed

‎.github/actions/run-tests/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG BASE_VARIANT=bullseye
2-
ARG GO_VERSION=1.16.12
2+
ARG GO_VERSION=1.17.5
33
ARG XX_VERSION=1.1.0
44

55
ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2

‎Dockerfile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
ARG BASE_VARIANT=bullseye
2-
ARG GO_VERSION=1.16.12
3-
ARG GO_LATEST=1.17.5
2+
ARG GO_VERSION=1.17
43
ARG XX_VERSION=1.1.0
54

65
ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2
@@ -10,7 +9,6 @@ FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
109
FROM ${LIBGIT2_IMG}:${LIBGIT2_TAG} as libgit2
1110

1211
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} as gostable
13-
FROM --platform=$BUILDPLATFORM golang:${GO_LATEST}-${BASE_VARIANT} AS golatest
1412

1513
FROM gostable AS go-linux
1614

‎api/go.mod‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,26 @@
11
module github.com/fluxcd/source-controller/api
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
github.com/fluxcd/pkg/apis/acl v0.0.1
77
github.com/fluxcd/pkg/apis/meta v0.10.1
88
k8s.io/apimachinery v0.22.2
99
sigs.k8s.io/controller-runtime v0.10.2
1010
)
11+
12+
require (
13+
github.com/go-logr/logr v0.4.0 // indirect
14+
github.com/gogo/protobuf v1.3.2 // indirect
15+
github.com/google/go-cmp v0.5.5 // indirect
16+
github.com/google/gofuzz v1.1.0 // indirect
17+
github.com/json-iterator/go v1.1.11 // indirect
18+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
19+
github.com/modern-go/reflect2 v1.0.1 // indirect
20+
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
21+
golang.org/x/text v0.3.6 // indirect
22+
gopkg.in/inf.v0 v0.9.1 // indirect
23+
gopkg.in/yaml.v2 v2.4.0 // indirect
24+
k8s.io/klog/v2 v2.9.0 // indirect
25+
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
26+
)

‎go.mod‎

Lines changed: 170 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
module github.com/fluxcd/source-controller
22

3-
go 1.16
3+
go 1.17
44

55
replace github.com/fluxcd/source-controller/api => ./api
66

77
require (
8-
cloud.google.com/go v0.93.3 // indirect
98
cloud.google.com/go/storage v1.16.0
109
github.com/Masterminds/semver/v3 v3.1.1
1110
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7
12-
github.com/bshuster-repo/logrus-logstash-hook v1.0.2 // indirect
13-
github.com/bugsnag/bugsnag-go v2.1.2+incompatible // indirect
14-
github.com/bugsnag/panicwrap v1.3.4 // indirect
1511
github.com/cyphar/filepath-securejoin v0.2.2
16-
github.com/docker/go-metrics v0.0.1 // indirect
17-
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
1812
github.com/fluxcd/pkg/apis/meta v0.10.1
1913
github.com/fluxcd/pkg/gittestserver v0.4.2
2014
github.com/fluxcd/pkg/gitutil v0.1.0
@@ -25,31 +19,18 @@ require (
2519
github.com/fluxcd/pkg/untar v0.1.0
2620
github.com/fluxcd/pkg/version v0.1.0
2721
github.com/fluxcd/source-controller/api v0.19.2
28-
github.com/garyburd/redigo v1.6.3 // indirect
2922
github.com/go-git/go-billy/v5 v5.3.1
3023
github.com/go-git/go-git/v5 v5.4.2
3124
github.com/go-logr/logr v0.4.0
32-
github.com/gofrs/uuid v4.1.0+incompatible // indirect
33-
github.com/googleapis/gax-go/v2 v2.1.0 // indirect
34-
github.com/gorilla/handlers v1.5.1 // indirect
35-
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
3625
github.com/libgit2/git2go/v31 v31.6.1
3726
github.com/minio/minio-go/v7 v7.0.15
3827
github.com/onsi/ginkgo v1.16.4
3928
github.com/onsi/gomega v1.15.0
4029
github.com/otiai10/copy v1.7.0
4130
github.com/spf13/pflag v1.0.5
42-
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
43-
github.com/yvasiyarov/gorelic v0.0.7 // indirect
44-
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect
4531
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b
46-
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
47-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
4832
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
49-
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
50-
golang.org/x/text v0.3.7 // indirect
5133
google.golang.org/api v0.54.0
52-
google.golang.org/genproto v0.0.0-20210830153122-0bac4d21c8ea // indirect
5334
gotest.tools v2.2.0+incompatible
5435
helm.sh/helm/v3 v3.6.3
5536
k8s.io/api v0.22.2
@@ -59,6 +40,175 @@ require (
5940
sigs.k8s.io/yaml v1.2.0
6041
)
6142

43+
require (
44+
cloud.google.com/go v0.90.0 // indirect
45+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
46+
github.com/BurntSushi/toml v0.3.1 // indirect
47+
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
48+
github.com/Masterminds/goutils v1.1.1 // indirect
49+
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
50+
github.com/Masterminds/squirrel v1.5.0 // indirect
51+
github.com/Microsoft/go-winio v0.4.16 // indirect
52+
github.com/Microsoft/hcsshim v0.8.14 // indirect
53+
github.com/PuerkitoBio/purell v1.1.1 // indirect
54+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
55+
github.com/acomagu/bufpipe v1.0.3 // indirect
56+
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
57+
github.com/beorn7/perks v1.0.1 // indirect
58+
github.com/bshuster-repo/logrus-logstash-hook v1.0.2 // indirect
59+
github.com/bugsnag/bugsnag-go v2.1.2+incompatible // indirect
60+
github.com/bugsnag/panicwrap v1.3.4 // indirect
61+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
62+
github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59 // indirect
63+
github.com/containerd/containerd v1.4.4 // indirect
64+
github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7 // indirect
65+
github.com/davecgh/go-spew v1.1.1 // indirect
66+
github.com/deislabs/oras v0.11.1 // indirect
67+
github.com/docker/cli v20.10.5+incompatible // indirect
68+
github.com/docker/distribution v2.7.1+incompatible // indirect
69+
github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible // indirect
70+
github.com/docker/docker-credential-helpers v0.6.3 // indirect
71+
github.com/docker/go-connections v0.4.0 // indirect
72+
github.com/docker/go-metrics v0.0.1 // indirect
73+
github.com/docker/go-units v0.4.0 // indirect
74+
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
75+
github.com/dustin/go-humanize v1.0.0 // indirect
76+
github.com/emirpasic/gods v1.12.0 // indirect
77+
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
78+
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
79+
github.com/fatih/color v1.7.0 // indirect
80+
github.com/fluxcd/pkg/apis/acl v0.0.1 // indirect
81+
github.com/fluxcd/pkg/testserver v0.1.0 // indirect
82+
github.com/fsnotify/fsnotify v1.4.9 // indirect
83+
github.com/garyburd/redigo v1.6.3 // indirect
84+
github.com/go-errors/errors v1.0.1 // indirect
85+
github.com/go-git/gcfg v1.5.0 // indirect
86+
github.com/go-logr/zapr v0.4.0 // indirect
87+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
88+
github.com/go-openapi/jsonreference v0.19.5 // indirect
89+
github.com/go-openapi/spec v0.19.5 // indirect
90+
github.com/go-openapi/swag v0.19.14 // indirect
91+
github.com/gobwas/glob v0.2.3 // indirect
92+
github.com/gofrs/uuid v4.1.0+incompatible // indirect
93+
github.com/gogo/protobuf v1.3.2 // indirect
94+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
95+
github.com/golang/protobuf v1.5.2 // indirect
96+
github.com/google/btree v1.0.1 // indirect
97+
github.com/google/go-cmp v0.5.6 // indirect
98+
github.com/google/gofuzz v1.1.0 // indirect
99+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
100+
github.com/google/uuid v1.1.2 // indirect
101+
github.com/googleapis/gax-go/v2 v2.1.0 // indirect
102+
github.com/googleapis/gnostic v0.5.5 // indirect
103+
github.com/gorilla/handlers v1.5.1 // indirect
104+
github.com/gorilla/mux v1.7.3 // indirect
105+
github.com/gosuri/uitable v0.0.4 // indirect
106+
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
107+
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
108+
github.com/hashicorp/go-retryablehttp v0.6.8 // indirect
109+
github.com/huandu/xstrings v1.3.1 // indirect
110+
github.com/imdario/mergo v0.3.12 // indirect
111+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
112+
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
113+
github.com/jmoiron/sqlx v1.3.1 // indirect
114+
github.com/josharian/intern v1.0.0 // indirect
115+
github.com/json-iterator/go v1.1.11 // indirect
116+
github.com/jstemmer/go-junit-report v0.9.1 // indirect
117+
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
118+
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
119+
github.com/klauspost/compress v1.13.5 // indirect
120+
github.com/klauspost/cpuid v1.3.1 // indirect
121+
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
122+
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
123+
github.com/lib/pq v1.10.0 // indirect
124+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
125+
github.com/mailru/easyjson v0.7.6 // indirect
126+
github.com/mattn/go-colorable v0.0.9 // indirect
127+
github.com/mattn/go-isatty v0.0.4 // indirect
128+
github.com/mattn/go-runewidth v0.0.7 // indirect
129+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
130+
github.com/minio/md5-simd v1.1.0 // indirect
131+
github.com/minio/sha256-simd v0.1.1 // indirect
132+
github.com/mitchellh/copystructure v1.1.1 // indirect
133+
github.com/mitchellh/go-homedir v1.1.0 // indirect
134+
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
135+
github.com/mitchellh/reflectwalk v1.0.1 // indirect
136+
github.com/moby/spdystream v0.2.0 // indirect
137+
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
138+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
139+
github.com/modern-go/reflect2 v1.0.1 // indirect
140+
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
141+
github.com/morikuni/aec v1.0.0 // indirect
142+
github.com/nxadm/tail v1.4.8 // indirect
143+
github.com/opencontainers/go-digest v1.0.0 // indirect
144+
github.com/opencontainers/image-spec v1.0.1 // indirect
145+
github.com/opencontainers/runc v0.1.1 // indirect
146+
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
147+
github.com/pkg/errors v0.9.1 // indirect
148+
github.com/pmezard/go-difflib v1.0.0 // indirect
149+
github.com/prometheus/client_golang v1.11.0 // indirect
150+
github.com/prometheus/client_model v0.2.0 // indirect
151+
github.com/prometheus/common v0.26.0 // indirect
152+
github.com/prometheus/procfs v0.6.0 // indirect
153+
github.com/rs/xid v1.2.1 // indirect
154+
github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351 // indirect
155+
github.com/russross/blackfriday v1.5.2 // indirect
156+
github.com/satori/go.uuid v1.2.0 // indirect
157+
github.com/sergi/go-diff v1.1.0 // indirect
158+
github.com/shopspring/decimal v1.2.0 // indirect
159+
github.com/sirupsen/logrus v1.8.1 // indirect
160+
github.com/sosedoff/gitkit v0.2.1-0.20200818155723-72ebbcf5056d // indirect
161+
github.com/spf13/cast v1.3.1 // indirect
162+
github.com/spf13/cobra v1.1.3 // indirect
163+
github.com/stretchr/testify v1.7.0 // indirect
164+
github.com/xanzy/ssh-agent v0.3.0 // indirect
165+
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
166+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
167+
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
168+
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
169+
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
170+
github.com/yvasiyarov/gorelic v0.0.7 // indirect
171+
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect
172+
go.opencensus.io v0.23.0 // indirect
173+
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
174+
go.uber.org/atomic v1.7.0 // indirect
175+
go.uber.org/multierr v1.6.0 // indirect
176+
go.uber.org/zap v1.19.0 // indirect
177+
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
178+
golang.org/x/mod v0.4.2 // indirect
179+
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
180+
golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a // indirect
181+
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 // indirect
182+
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
183+
golang.org/x/text v0.3.6 // indirect
184+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
185+
golang.org/x/tools v0.1.5 // indirect
186+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
187+
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
188+
google.golang.org/appengine v1.6.7 // indirect
189+
google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8 // indirect
190+
google.golang.org/grpc v1.40.0 // indirect
191+
google.golang.org/protobuf v1.27.1 // indirect
192+
gopkg.in/gorp.v1 v1.7.2 // indirect
193+
gopkg.in/inf.v0 v0.9.1 // indirect
194+
gopkg.in/ini.v1 v1.57.0 // indirect
195+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
196+
gopkg.in/warnings.v0 v0.1.2 // indirect
197+
gopkg.in/yaml.v2 v2.4.0 // indirect
198+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
199+
k8s.io/apiextensions-apiserver v0.22.2 // indirect
200+
k8s.io/apiserver v0.22.2 // indirect
201+
k8s.io/cli-runtime v0.21.0 // indirect
202+
k8s.io/component-base v0.22.2 // indirect
203+
k8s.io/klog/v2 v2.9.0 // indirect
204+
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
205+
k8s.io/kubectl v0.21.0 // indirect
206+
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
207+
sigs.k8s.io/kustomize/api v0.8.5 // indirect
208+
sigs.k8s.io/kustomize/kyaml v0.10.15 // indirect
209+
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
210+
)
211+
62212
// Required by https://github.com/helm/helm/blob/v3.6.3/go.mod,
63213
// but overwritten with a newer version due to CVE-2017-11468.
64214
replace github.com/docker/distribution => github.com/docker/distribution v2.7.0-rc.0+incompatible

0 commit comments

Comments
 (0)