Skip to content

Commit 8312c64

Browse files
committed
Update Go to v1.17
Signed-off-by: Aurel Canciu <[email protected]>
1 parent 90dcdfd commit 8312c64

File tree

7 files changed

+112
-5
lines changed

7 files changed

+112
-5
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.8
2+
ARG GO_VERSION=1.17.2
33
ARG XX_VERSION=1.0.0-rc.2
44

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

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG BASE_VARIANT=bullseye
2-
ARG GO_VERSION=1.16.8
2+
ARG GO_VERSION=1.17.2
33
ARG XX_VERSION=1.0.0-rc.2
44

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

1111
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} as gostable
12-
FROM --platform=$BUILDPLATFORM golang:1.17rc1-${BASE_VARIANT} AS golatest
1312

1413
FROM gostable AS go-linux
1514

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/image-automation-controller/api
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
github.com/fluxcd/pkg/apis/meta v0.10.1
77
github.com/fluxcd/source-controller/api v0.19.0
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-20210428140749-89ef3d95e781 // 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.8.0 // indirect
25+
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
26+
)

api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v1alpha2/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v1beta1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 90 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/fluxcd/image-automation-controller
22

3-
go 1.16
3+
go 1.17
44

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

@@ -35,6 +35,95 @@ require (
3535
sigs.k8s.io/kustomize/kyaml v0.10.21
3636
)
3737

38+
require (
39+
cloud.google.com/go v0.93.3 // indirect
40+
github.com/Masterminds/goutils v1.1.1 // indirect
41+
github.com/Masterminds/semver/v3 v3.1.1 // indirect
42+
github.com/Microsoft/go-winio v0.5.0 // indirect
43+
github.com/PuerkitoBio/purell v1.1.1 // indirect
44+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
45+
github.com/acomagu/bufpipe v1.0.3 // indirect
46+
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
47+
github.com/beorn7/perks v1.0.1 // indirect
48+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
49+
github.com/davecgh/go-spew v1.1.1 // indirect
50+
github.com/emirpasic/gods v1.12.0 // indirect
51+
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
52+
github.com/fluxcd/pkg/apis/acl v0.0.1 // indirect
53+
github.com/fluxcd/pkg/gitutil v0.1.0 // indirect
54+
github.com/fluxcd/pkg/version v0.1.0 // indirect
55+
github.com/fsnotify/fsnotify v1.4.9 // indirect
56+
github.com/go-errors/errors v1.0.1 // indirect
57+
github.com/go-git/gcfg v1.5.0 // indirect
58+
github.com/go-logr/zapr v0.4.0 // indirect
59+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
60+
github.com/go-openapi/jsonreference v0.19.5 // indirect
61+
github.com/go-openapi/swag v0.19.14 // indirect
62+
github.com/gogo/protobuf v1.3.2 // indirect
63+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
64+
github.com/golang/protobuf v1.5.2 // indirect
65+
github.com/google/go-cmp v0.5.6 // indirect
66+
github.com/google/gofuzz v1.1.0 // indirect
67+
github.com/google/uuid v1.2.0 // indirect
68+
github.com/googleapis/gnostic v0.5.5 // indirect
69+
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
70+
github.com/hashicorp/go-retryablehttp v0.6.8 // indirect
71+
github.com/huandu/xstrings v1.3.1 // indirect
72+
github.com/imdario/mergo v0.3.12 // indirect
73+
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
74+
github.com/josharian/intern v1.0.0 // indirect
75+
github.com/json-iterator/go v1.1.11 // indirect
76+
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
77+
github.com/mailru/easyjson v0.7.6 // indirect
78+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
79+
github.com/mitchellh/copystructure v1.1.1 // indirect
80+
github.com/mitchellh/go-homedir v1.1.0 // indirect
81+
github.com/mitchellh/mapstructure v1.4.1 // indirect
82+
github.com/mitchellh/reflectwalk v1.0.1 // indirect
83+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
84+
github.com/modern-go/reflect2 v1.0.1 // indirect
85+
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
86+
github.com/nxadm/tail v1.4.8 // indirect
87+
github.com/pkg/errors v0.9.1 // indirect
88+
github.com/pmezard/go-difflib v1.0.0 // indirect
89+
github.com/prometheus/client_golang v1.11.0 // indirect
90+
github.com/prometheus/client_model v0.2.0 // indirect
91+
github.com/prometheus/common v0.26.0 // indirect
92+
github.com/prometheus/procfs v0.6.0 // indirect
93+
github.com/satori/go.uuid v1.2.0 // indirect
94+
github.com/sergi/go-diff v1.1.0 // indirect
95+
github.com/shopspring/decimal v1.2.0 // indirect
96+
github.com/sosedoff/gitkit v0.2.1-0.20200818155723-72ebbcf5056d // indirect
97+
github.com/spf13/cast v1.3.1 // indirect
98+
github.com/stretchr/testify v1.7.0 // indirect
99+
github.com/xanzy/ssh-agent v0.3.0 // indirect
100+
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
101+
go.uber.org/atomic v1.7.0 // indirect
102+
go.uber.org/multierr v1.6.0 // indirect
103+
go.uber.org/zap v1.19.0 // indirect
104+
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect
105+
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
106+
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
107+
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
108+
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
109+
golang.org/x/text v0.3.7 // indirect
110+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
111+
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
112+
google.golang.org/appengine v1.6.7 // indirect
113+
google.golang.org/protobuf v1.27.1 // indirect
114+
gopkg.in/inf.v0 v0.9.1 // indirect
115+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
116+
gopkg.in/warnings.v0 v0.1.2 // indirect
117+
gopkg.in/yaml.v2 v2.4.0 // indirect
118+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
119+
k8s.io/apiextensions-apiserver v0.22.2 // indirect
120+
k8s.io/component-base v0.22.2 // indirect
121+
k8s.io/klog/v2 v2.9.0 // indirect
122+
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
123+
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
124+
sigs.k8s.io/yaml v1.2.0 // indirect
125+
)
126+
38127
// Side-effect of depending on source-controller;
39128
// required by https://github.com/helm/helm/blob/v3.6.3/go.mod,
40129
// but overwritten with a newer version due to CVE-2017-11468.

0 commit comments

Comments
 (0)