Skip to content

Commit 76685de

Browse files
Upgrade deps
- Mandate Go 1.20 since we have this as baseline - Use upstream for CloudEvent protocol All our forked changes are upstreamed in latest release. - Upgrade to Kubernetes 0.29.1 Hopefully has less awkward deps
1 parent d324d26 commit 76685de

File tree

2 files changed

+145
-747
lines changed

2 files changed

+145
-747
lines changed

go.mod

+44-48
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/otto-de/sherlock-microservice
22

3-
go 1.18
3+
go 1.20
44

55
require (
66
cloud.google.com/go/compute/metadata v0.2.3
@@ -10,20 +10,20 @@ require (
1010
cloud.google.com/go/pubsub v1.33.0
1111
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.21.0
1212
github.com/GoogleCloudPlatform/opentelemetry-operations-go/propagator v0.45.0
13-
github.com/cloudevents/sdk-go/protocol/pubsub/v2 v2.14.0
14-
github.com/cloudevents/sdk-go/v2 v2.14.0
13+
github.com/cloudevents/sdk-go/protocol/pubsub/v2 v2.15.0
14+
github.com/cloudevents/sdk-go/v2 v2.15.0
1515
github.com/google/go-cmp v0.6.0
1616
go.opentelemetry.io/otel v1.22.0
1717
go.opentelemetry.io/otel/sdk v1.22.0
1818
go.opentelemetry.io/otel/trace v1.22.0
1919
google.golang.org/api v0.126.0
2020
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e
2121
google.golang.org/grpc v1.58.3
22-
k8s.io/api v0.24.4
23-
k8s.io/apimachinery v0.24.4
24-
k8s.io/cli-runtime v0.24.4
25-
k8s.io/client-go v0.24.4
26-
k8s.io/kubectl v0.24.4
22+
k8s.io/api v0.29.1
23+
k8s.io/apimachinery v0.29.1
24+
k8s.io/cli-runtime v0.29.1
25+
k8s.io/client-go v0.29.1
26+
k8s.io/kubectl v0.29.1
2727
)
2828

2929
require (
@@ -34,86 +34,82 @@ require (
3434
cloud.google.com/go/trace v1.10.1 // indirect
3535
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
3636
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.45.0 // indirect
37-
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
38-
github.com/PuerkitoBio/purell v1.1.1 // indirect
39-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
40-
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
37+
github.com/MakeNowJust/heredoc v1.0.0 // indirect
38+
github.com/chai2010/gettext-go v1.0.2 // indirect
4139
github.com/davecgh/go-spew v1.1.1 // indirect
42-
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
40+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4341
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
4442
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
4543
github.com/fatih/camelcase v1.0.0 // indirect
46-
github.com/fvbommel/sortorder v1.0.1 // indirect
47-
github.com/go-errors/errors v1.0.1 // indirect
44+
github.com/fvbommel/sortorder v1.1.0 // indirect
45+
github.com/go-errors/errors v1.4.2 // indirect
4846
github.com/go-logr/logr v1.4.1 // indirect
4947
github.com/go-logr/stdr v1.2.2 // indirect
50-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
51-
github.com/go-openapi/jsonreference v0.19.5 // indirect
52-
github.com/go-openapi/swag v0.19.14 // indirect
48+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
49+
github.com/go-openapi/jsonreference v0.20.2 // indirect
50+
github.com/go-openapi/swag v0.22.3 // indirect
5351
github.com/gogo/protobuf v1.3.2 // indirect
5452
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5553
github.com/golang/protobuf v1.5.3 // indirect
5654
github.com/google/btree v1.0.1 // indirect
57-
github.com/google/gnostic v0.5.7-v3refs // indirect
58-
github.com/google/gofuzz v1.1.0 // indirect
55+
github.com/google/gnostic-models v0.6.8 // indirect
56+
github.com/google/gofuzz v1.2.0 // indirect
5957
github.com/google/s2a-go v0.1.4 // indirect
6058
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
6159
github.com/google/uuid v1.3.0 // indirect
6260
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
6361
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
62+
github.com/gorilla/websocket v1.5.0 // indirect
6463
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
65-
github.com/imdario/mergo v0.3.5 // indirect
66-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
64+
github.com/imdario/mergo v0.3.6 // indirect
65+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6766
github.com/josharian/intern v1.0.0 // indirect
6867
github.com/json-iterator/go v1.1.12 // indirect
6968
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
70-
github.com/mailru/easyjson v0.7.6 // indirect
71-
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
69+
github.com/mailru/easyjson v0.7.7 // indirect
70+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
7271
github.com/moby/spdystream v0.2.0 // indirect
73-
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
72+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
7473
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7574
github.com/modern-go/reflect2 v1.0.2 // indirect
7675
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
7776
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
77+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7878
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7979
github.com/pkg/errors v0.9.1 // indirect
80-
github.com/pmezard/go-difflib v1.0.0 // indirect
81-
github.com/russross/blackfriday v1.5.2 // indirect
82-
github.com/spf13/cobra v1.4.0 // indirect
80+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
81+
github.com/spf13/cobra v1.7.0 // indirect
8382
github.com/spf13/pflag v1.0.5 // indirect
84-
github.com/stretchr/testify v1.8.4 // indirect
85-
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
83+
github.com/xlab/treeprint v1.2.0 // indirect
8684
go.opencensus.io v0.24.0 // indirect
8785
go.opentelemetry.io/otel/metric v1.22.0 // indirect
88-
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
89-
go.uber.org/atomic v1.7.0 // indirect
90-
go.uber.org/multierr v1.6.0 // indirect
86+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
87+
go.uber.org/atomic v1.10.0 // indirect
88+
go.uber.org/multierr v1.11.0 // indirect
9189
go.uber.org/zap v1.19.0 // indirect
9290
golang.org/x/crypto v0.17.0 // indirect
93-
golang.org/x/net v0.17.0 // indirect
91+
golang.org/x/net v0.19.0 // indirect
9492
golang.org/x/oauth2 v0.10.0 // indirect
95-
golang.org/x/sync v0.3.0 // indirect
93+
golang.org/x/sync v0.5.0 // indirect
9694
golang.org/x/sys v0.16.0 // indirect
9795
golang.org/x/term v0.15.0 // indirect
9896
golang.org/x/text v0.14.0 // indirect
9997
golang.org/x/time v0.3.0 // indirect
10098
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
10199
google.golang.org/appengine v1.6.7 // indirect
102-
google.golang.org/genproto v0.0.0-20230731193218-e0aa005b6bdf // indirect
103-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d // indirect
100+
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
101+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
104102
google.golang.org/protobuf v1.31.0 // indirect
105103
gopkg.in/inf.v0 v0.9.1 // indirect
106104
gopkg.in/yaml.v2 v2.4.0 // indirect
107105
gopkg.in/yaml.v3 v3.0.1 // indirect
108-
k8s.io/component-base v0.24.4 // indirect
109-
k8s.io/klog/v2 v2.60.1 // indirect
110-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
111-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
112-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
113-
sigs.k8s.io/kustomize/api v0.11.4 // indirect
114-
sigs.k8s.io/kustomize/kyaml v0.13.6 // indirect
115-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
116-
sigs.k8s.io/yaml v1.2.0 // indirect
106+
k8s.io/component-base v0.29.1 // indirect
107+
k8s.io/klog/v2 v2.110.1 // indirect
108+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
109+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
110+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
111+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
112+
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
113+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
114+
sigs.k8s.io/yaml v1.3.0 // indirect
117115
)
118-
119-
replace github.com/cloudevents/sdk-go/protocol/pubsub/v2 => github.com/abergmeier/cloudevents-sdk-go/protocol/pubsub/v2 v2.14.1

0 commit comments

Comments
 (0)