Skip to content

Commit c5f1223

Browse files
committed
Move fully to golang 1.17
note: kubernetes-sigs/json#9 We are using controller-tools v0.8.0, which includes this as a dependency which requires 1.17
1 parent 9d243e3 commit c5f1223

File tree

9 files changed

+346
-169
lines changed

9 files changed

+346
-169
lines changed

go.mod

+105-7
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,22 @@
11
module github.com/elastic/cloud-on-k8s
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
github.com/Masterminds/sprig/v3 v3.2.2
77
github.com/blang/semver/v4 v4.0.0
8-
github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect
98
github.com/davecgh/go-spew v1.1.1
10-
github.com/dgryski/go-gk v0.0.0-20140819190930-201884a44051 // indirect
119
github.com/elastic/go-ucfg v0.8.4
12-
github.com/elazarl/goproxy v0.0.0-20190711103511-473e67f1d7d2 // indirect
1310
github.com/fsnotify/fsnotify v1.5.1
1411
github.com/ghodss/yaml v1.0.0
1512
github.com/go-logr/logr v1.2.2
1613
github.com/go-test/deep v1.0.8
1714
github.com/gobuffalo/flect v0.2.4
1815
github.com/google/go-cmp v0.5.6
19-
github.com/google/gofuzz v1.2.0 // indirect
2016
github.com/google/uuid v1.3.0
2117
github.com/hashicorp/go-multierror v1.1.1
2218
github.com/hashicorp/vault/api v1.3.1
2319
github.com/imdario/mergo v0.3.12
24-
github.com/influxdata/tdigest v0.0.1 // indirect
2520
github.com/magiconair/properties v1.8.5
2621
github.com/pkg/errors v0.9.1
2722
github.com/pmezard/go-difflib v1.0.0
@@ -31,7 +26,6 @@ require (
3126
github.com/spf13/cobra v1.3.0
3227
github.com/spf13/pflag v1.0.5
3328
github.com/spf13/viper v1.10.1
34-
github.com/streadway/quantile v0.0.0-20150917103942-b0c588724d25 // indirect
3529
github.com/stretchr/testify v1.7.0
3630
github.com/tsenart/vegeta v12.7.0+incompatible
3731
go.elastic.co/apm v1.15.0
@@ -50,5 +44,109 @@ require (
5044
sigs.k8s.io/controller-tools v0.8.0
5145
)
5246

47+
require (
48+
cloud.google.com/go v0.99.0 // indirect
49+
github.com/Masterminds/goutils v1.1.1 // indirect
50+
github.com/Masterminds/semver/v3 v3.1.1 // indirect
51+
github.com/armon/go-metrics v0.3.10 // indirect
52+
github.com/armon/go-radix v1.0.0 // indirect
53+
github.com/beorn7/perks v1.0.1 // indirect
54+
github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect
55+
github.com/cenkalti/backoff/v3 v3.0.0 // indirect
56+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
57+
github.com/dgryski/go-gk v0.0.0-20140819190930-201884a44051 // indirect
58+
github.com/elastic/go-licenser v0.3.1 // indirect
59+
github.com/elastic/go-sysinfo v1.1.1 // indirect
60+
github.com/elastic/go-windows v1.0.0 // indirect
61+
github.com/elazarl/goproxy v0.0.0-20190711103511-473e67f1d7d2 // indirect
62+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
63+
github.com/fatih/color v1.13.0 // indirect
64+
github.com/go-logr/zapr v1.2.0 // indirect
65+
github.com/gogo/protobuf v1.3.2 // indirect
66+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
67+
github.com/golang/protobuf v1.5.2 // indirect
68+
github.com/golang/snappy v0.0.4 // indirect
69+
github.com/google/gofuzz v1.2.0 // indirect
70+
github.com/googleapis/gnostic v0.5.5 // indirect
71+
github.com/hashicorp/errwrap v1.1.0 // indirect
72+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
73+
github.com/hashicorp/go-hclog v1.0.0 // indirect
74+
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
75+
github.com/hashicorp/go-plugin v1.4.3 // indirect
76+
github.com/hashicorp/go-retryablehttp v0.6.6 // indirect
77+
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
78+
github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 // indirect
79+
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1 // indirect
80+
github.com/hashicorp/go-secure-stdlib/strutil v0.1.1 // indirect
81+
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
82+
github.com/hashicorp/go-uuid v1.0.2 // indirect
83+
github.com/hashicorp/go-version v1.2.0 // indirect
84+
github.com/hashicorp/golang-lru v0.5.4 // indirect
85+
github.com/hashicorp/hcl v1.0.0 // indirect
86+
github.com/hashicorp/vault/sdk v0.3.0 // indirect
87+
github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
88+
github.com/huandu/xstrings v1.3.1 // indirect
89+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
90+
github.com/influxdata/tdigest v0.0.1 // indirect
91+
github.com/jcchavezs/porto v0.1.0 // indirect
92+
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
93+
github.com/josharian/intern v1.0.0 // indirect
94+
github.com/json-iterator/go v1.1.12 // indirect
95+
github.com/mailru/easyjson v0.7.6 // indirect
96+
github.com/mattn/go-colorable v0.1.12 // indirect
97+
github.com/mattn/go-isatty v0.0.14 // indirect
98+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
99+
github.com/mitchellh/copystructure v1.0.0 // indirect
100+
github.com/mitchellh/go-homedir v1.1.0 // indirect
101+
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
102+
github.com/mitchellh/mapstructure v1.4.3 // indirect
103+
github.com/mitchellh/reflectwalk v1.0.0 // indirect
104+
github.com/moby/spdystream v0.2.0 // indirect
105+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
106+
github.com/modern-go/reflect2 v1.0.2 // indirect
107+
github.com/oklog/run v1.0.0 // indirect
108+
github.com/pelletier/go-toml v1.9.4 // indirect
109+
github.com/pierrec/lz4 v2.5.2+incompatible // indirect
110+
github.com/prometheus/client_model v0.2.0 // indirect
111+
github.com/prometheus/procfs v0.6.0 // indirect
112+
github.com/ryanuber/go-glob v1.0.0 // indirect
113+
github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect
114+
github.com/shopspring/decimal v1.2.0 // indirect
115+
github.com/spf13/afero v1.6.0 // indirect
116+
github.com/spf13/cast v1.4.1 // indirect
117+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
118+
github.com/streadway/quantile v0.0.0-20150917103942-b0c588724d25 // indirect
119+
github.com/subosito/gotenv v1.2.0 // indirect
120+
go.elastic.co/apm/module/apmhttp v1.15.0 // indirect
121+
go.elastic.co/fastjson v1.1.0 // indirect
122+
go.uber.org/atomic v1.9.0 // indirect
123+
go.uber.org/multierr v1.6.0 // indirect
124+
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
125+
golang.org/x/mod v0.5.0 // indirect
126+
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
127+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
128+
golang.org/x/sys v0.0.0-20211210111614-af8b64212486 // indirect
129+
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
130+
golang.org/x/text v0.3.7 // indirect
131+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
132+
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff // indirect
133+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
134+
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
135+
google.golang.org/appengine v1.6.7 // indirect
136+
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
137+
google.golang.org/grpc v1.43.0 // indirect
138+
google.golang.org/protobuf v1.27.1 // indirect
139+
gopkg.in/inf.v0 v0.9.1 // indirect
140+
gopkg.in/ini.v1 v1.66.2 // indirect
141+
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
142+
howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect
143+
k8s.io/apiextensions-apiserver v0.23.0 // indirect
144+
k8s.io/component-base v0.23.0 // indirect
145+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
146+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
147+
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
148+
sigs.k8s.io/yaml v1.3.0 // indirect
149+
)
150+
53151
// this is used by vegeta, but the version they use is older and did not include a licence. we require the licence and so pin this
54152
replace github.com/dgryski/go-gk => github.com/dgryski/go-gk v0.0.0-20200319235926-a69029f61654

hack/config-extractor/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/elastic/cloud-on-k8s/hack/config-extractor
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
k8s.io/api v0.22.4

hack/manifest-gen/go.mod

+128-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,140 @@
11
module github.com/elastic/cloud-on-k8s/hack/manifest-gen
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
github.com/spf13/cobra v1.3.0
77
helm.sh/helm/v3 v3.7.2
88
sigs.k8s.io/kustomize/kyaml v0.13.0
99
)
1010

11+
require (
12+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
13+
github.com/BurntSushi/toml v0.3.1 // indirect
14+
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
15+
github.com/Masterminds/goutils v1.1.1 // indirect
16+
github.com/Masterminds/semver/v3 v3.1.1 // indirect
17+
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
18+
github.com/Masterminds/squirrel v1.5.2 // indirect
19+
github.com/Microsoft/go-winio v0.4.17 // indirect
20+
github.com/Microsoft/hcsshim v0.8.21 // indirect
21+
github.com/PuerkitoBio/purell v1.1.1 // indirect
22+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
23+
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
24+
github.com/beorn7/perks v1.0.1 // indirect
25+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
26+
github.com/containerd/containerd v1.5.7 // indirect
27+
github.com/containerd/continuity v0.1.0 // indirect
28+
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
29+
github.com/davecgh/go-spew v1.1.1 // indirect
30+
github.com/docker/cli v20.10.7+incompatible // indirect
31+
github.com/docker/distribution v2.7.1+incompatible // indirect
32+
github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible // indirect
33+
github.com/docker/docker-credential-helpers v0.6.3 // indirect
34+
github.com/docker/go-connections v0.4.0 // indirect
35+
github.com/docker/go-metrics v0.0.1 // indirect
36+
github.com/docker/go-units v0.4.0 // indirect
37+
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
38+
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
39+
github.com/fatih/color v1.13.0 // indirect
40+
github.com/go-errors/errors v1.0.1 // indirect
41+
github.com/go-logr/logr v0.4.0 // indirect
42+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
43+
github.com/go-openapi/jsonreference v0.19.5 // indirect
44+
github.com/go-openapi/swag v0.19.14 // indirect
45+
github.com/gobwas/glob v0.2.3 // indirect
46+
github.com/gogo/protobuf v1.3.2 // indirect
47+
github.com/golang/protobuf v1.5.2 // indirect
48+
github.com/google/btree v1.0.1 // indirect
49+
github.com/google/go-cmp v0.5.6 // indirect
50+
github.com/google/gofuzz v1.1.0 // indirect
51+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
52+
github.com/google/uuid v1.2.0 // indirect
53+
github.com/googleapis/gnostic v0.5.5 // indirect
54+
github.com/gorilla/mux v1.8.0 // indirect
55+
github.com/gosuri/uitable v0.0.4 // indirect
56+
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
57+
github.com/huandu/xstrings v1.3.2 // indirect
58+
github.com/imdario/mergo v0.3.12 // indirect
59+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
60+
github.com/jmoiron/sqlx v1.3.1 // indirect
61+
github.com/josharian/intern v1.0.0 // indirect
62+
github.com/json-iterator/go v1.1.12 // indirect
63+
github.com/klauspost/compress v1.11.13 // indirect
64+
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
65+
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
66+
github.com/lib/pq v1.10.0 // indirect
67+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
68+
github.com/mailru/easyjson v0.7.6 // indirect
69+
github.com/mattn/go-colorable v0.1.12 // indirect
70+
github.com/mattn/go-isatty v0.0.14 // indirect
71+
github.com/mattn/go-runewidth v0.0.9 // indirect
72+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
73+
github.com/mitchellh/copystructure v1.1.1 // indirect
74+
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
75+
github.com/mitchellh/reflectwalk v1.0.1 // indirect
76+
github.com/moby/locker v1.0.1 // indirect
77+
github.com/moby/spdystream v0.2.0 // indirect
78+
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
79+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
80+
github.com/modern-go/reflect2 v1.0.2 // indirect
81+
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
82+
github.com/morikuni/aec v1.0.0 // indirect
83+
github.com/opencontainers/go-digest v1.0.0 // indirect
84+
github.com/opencontainers/image-spec v1.0.1 // indirect
85+
github.com/opencontainers/runc v1.0.2 // indirect
86+
github.com/peterbourgon/diskv v2.0.1+incompatible // 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/rubenv/sql-migrate v0.0.0-20210614095031-55d5740dbbcc // indirect
94+
github.com/russross/blackfriday v1.5.2 // indirect
95+
github.com/shopspring/decimal v1.2.0 // indirect
96+
github.com/sirupsen/logrus v1.8.1 // indirect
97+
github.com/spf13/cast v1.4.1 // indirect
98+
github.com/spf13/pflag v1.0.5 // indirect
99+
github.com/stretchr/testify v1.7.0 // indirect
100+
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
101+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
102+
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
103+
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
104+
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
105+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
106+
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
107+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
108+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
109+
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
110+
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
111+
golang.org/x/text v0.3.7 // indirect
112+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
113+
google.golang.org/appengine v1.6.7 // indirect
114+
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
115+
google.golang.org/grpc v1.42.0 // indirect
116+
google.golang.org/protobuf v1.27.1 // indirect
117+
gopkg.in/gorp.v1 v1.7.2 // indirect
118+
gopkg.in/inf.v0 v0.9.1 // indirect
119+
gopkg.in/yaml.v2 v2.4.0 // indirect
120+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
121+
k8s.io/api v0.22.4 // indirect
122+
k8s.io/apiextensions-apiserver v0.22.4 // indirect
123+
k8s.io/apimachinery v0.22.4 // indirect
124+
k8s.io/apiserver v0.22.4 // indirect
125+
k8s.io/cli-runtime v0.22.4 // indirect
126+
k8s.io/client-go v0.22.4 // indirect
127+
k8s.io/component-base v0.22.4 // indirect
128+
k8s.io/klog/v2 v2.9.0 // indirect
129+
k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c // indirect
130+
k8s.io/kubectl v0.22.4 // indirect
131+
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
132+
oras.land/oras-go v0.4.0 // indirect
133+
sigs.k8s.io/kustomize/api v0.8.11 // indirect
134+
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
135+
sigs.k8s.io/yaml v1.2.0 // indirect
136+
)
137+
11138
exclude (
12139
github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44
13140
github.com/containernetworking/cni v0.7.1

0 commit comments

Comments
 (0)