Skip to content

Commit afe4a3a

Browse files
authored
Merge pull request kubernetes-sigs#2143 from shiftstack/issue2142
🐛 Ensure tools deps aren't older than CAPO deps
2 parents 20e8bac + 543778e commit afe4a3a

File tree

3 files changed

+383
-418
lines changed

3 files changed

+383
-418
lines changed

hack/tools/go.mod

Lines changed: 79 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,55 @@ require (
66
github.com/a8m/envsubst v1.2.0
77
github.com/ahmetb/gen-crd-api-reference-docs v0.3.1-0.20220420215017-3f29e6853552
88
github.com/itchyny/gojq v0.12.2
9-
github.com/onsi/ginkgo/v2 v2.15.0
9+
github.com/onsi/ginkgo/v2 v2.17.1
1010
go.uber.org/mock v0.4.0
11-
k8s.io/code-generator v0.29.0
11+
k8s.io/code-generator v0.29.3
12+
sigs.k8s.io/cluster-api-provider-openstack v0.0.0
1213
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221129083400-679ae3e9e6b6
1314
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230926180527-c93e2abcb28e
1415
sigs.k8s.io/controller-tools v0.14.0
1516
sigs.k8s.io/kustomize/kustomize/v5 v5.2.1
1617
)
1718

1819
require (
20+
github.com/NYTimes/gziphandler v1.1.1 // indirect
21+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1 // indirect
22+
github.com/beorn7/perks v1.0.1 // indirect
1923
github.com/blang/semver v3.5.1+incompatible // indirect
20-
github.com/davecgh/go-spew v1.1.1 // indirect
21-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
24+
github.com/blang/semver/v4 v4.0.0 // indirect
25+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
26+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
27+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
28+
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
29+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
2230
github.com/fatih/color v1.16.0 // indirect
31+
github.com/felixge/httpsnoop v1.0.4 // indirect
32+
github.com/fsnotify/fsnotify v1.7.0 // indirect
2333
github.com/go-errors/errors v1.4.2 // indirect
24-
github.com/go-logr/logr v1.3.0 // indirect
25-
github.com/go-logr/zapr v1.2.0 // indirect
34+
github.com/go-logr/logr v1.4.1 // indirect
35+
github.com/go-logr/stdr v1.2.2 // indirect
36+
github.com/go-logr/zapr v1.3.0 // indirect
2637
github.com/go-openapi/jsonpointer v0.19.6 // indirect
2738
github.com/go-openapi/jsonreference v0.20.2 // indirect
2839
github.com/go-openapi/swag v0.22.3 // indirect
2940
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
3041
github.com/gobuffalo/flect v1.0.2 // indirect
42+
github.com/gofrs/uuid/v5 v5.2.0 // indirect
3143
github.com/gogo/protobuf v1.3.2 // indirect
32-
github.com/golang/protobuf v1.5.3 // indirect
44+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
45+
github.com/golang/protobuf v1.5.4 // indirect
46+
github.com/google/cel-go v0.17.7 // indirect
3347
github.com/google/gnostic-models v0.6.8 // indirect
48+
github.com/google/go-cmp v0.6.0 // indirect
3449
github.com/google/gofuzz v1.2.0 // indirect
3550
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
3651
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
37-
github.com/imdario/mergo v0.3.13 // indirect
52+
github.com/google/uuid v1.4.0 // indirect
53+
github.com/gophercloud/gophercloud/v2 v2.0.0 // indirect
54+
github.com/gophercloud/utils/v2 v2.0.0-20240701101423-2401526caee5 // indirect
55+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
56+
github.com/hashicorp/go-version v1.4.0 // indirect
57+
github.com/imdario/mergo v0.3.15 // indirect
3858
github.com/inconshreveable/mousetrap v1.1.0 // indirect
3959
github.com/itchyny/go-flags v1.5.0 // indirect
4060
github.com/itchyny/timefmt-go v0.1.2 // indirect
@@ -43,39 +63,73 @@ require (
4363
github.com/mailru/easyjson v0.7.7 // indirect
4464
github.com/mattn/go-colorable v0.1.13 // indirect
4565
github.com/mattn/go-isatty v0.0.20 // indirect
46-
github.com/mattn/go-runewidth v0.0.9 // indirect
66+
github.com/mattn/go-runewidth v0.0.14 // indirect
67+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
68+
github.com/mitchellh/go-homedir v1.1.0 // indirect
4769
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4870
github.com/modern-go/reflect2 v1.0.2 // indirect
4971
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
72+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
73+
github.com/onsi/gomega v1.32.0 // indirect
5074
github.com/pkg/errors v0.9.1 // indirect
75+
github.com/prometheus/client_golang v1.18.0 // indirect
76+
github.com/prometheus/client_model v0.5.0 // indirect
77+
github.com/prometheus/common v0.45.0 // indirect
78+
github.com/prometheus/procfs v0.12.0 // indirect
79+
github.com/rivo/uniseg v0.4.2 // indirect
5180
github.com/russross/blackfriday/v2 v2.1.0 // indirect
52-
github.com/spf13/afero v1.9.2 // indirect
81+
github.com/spf13/afero v1.11.0 // indirect
5382
github.com/spf13/cobra v1.8.0 // indirect
5483
github.com/spf13/pflag v1.0.5 // indirect
84+
github.com/stoewer/go-strcase v1.3.0 // indirect
5585
github.com/xlab/treeprint v1.2.0 // indirect
56-
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
57-
go.uber.org/atomic v1.10.0 // indirect
86+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
87+
go.opentelemetry.io/otel v1.22.0 // indirect
88+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
89+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
90+
go.opentelemetry.io/otel/metric v1.22.0 // indirect
91+
go.opentelemetry.io/otel/sdk v1.22.0 // indirect
92+
go.opentelemetry.io/otel/trace v1.22.0 // indirect
93+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
94+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
5895
go.uber.org/multierr v1.11.0 // indirect
59-
go.uber.org/zap v1.19.1 // indirect
60-
golang.org/x/mod v0.14.0 // indirect
61-
golang.org/x/net v0.19.0 // indirect
62-
golang.org/x/sys v0.15.0 // indirect
63-
golang.org/x/text v0.14.0 // indirect
64-
golang.org/x/tools v0.16.1 // indirect
96+
go.uber.org/zap v1.26.0 // indirect
97+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
98+
golang.org/x/mod v0.17.0 // indirect
99+
golang.org/x/net v0.25.0 // indirect
100+
golang.org/x/oauth2 v0.18.0 // indirect
101+
golang.org/x/sync v0.7.0 // indirect
102+
golang.org/x/sys v0.21.0 // indirect
103+
golang.org/x/term v0.21.0 // indirect
104+
golang.org/x/text v0.16.0 // indirect
105+
golang.org/x/time v0.5.0 // indirect
106+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
65107
golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect
66-
google.golang.org/protobuf v1.31.0 // indirect
108+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
109+
google.golang.org/appengine v1.6.8 // indirect
110+
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
111+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
112+
google.golang.org/grpc v1.60.1 // indirect
113+
google.golang.org/protobuf v1.33.0 // indirect
67114
gopkg.in/evanphx/json-patch.v5 v5.6.0 // indirect
68115
gopkg.in/inf.v0 v0.9.1 // indirect
69116
gopkg.in/yaml.v2 v2.4.0 // indirect
70117
gopkg.in/yaml.v3 v3.0.1 // indirect
71-
k8s.io/api v0.29.0 // indirect
72-
k8s.io/apiextensions-apiserver v0.29.0 // indirect
73-
k8s.io/apimachinery v0.29.0 // indirect
118+
k8s.io/api v0.29.3 // indirect
119+
k8s.io/apiextensions-apiserver v0.29.3 // indirect
120+
k8s.io/apimachinery v0.29.3 // indirect
121+
k8s.io/apiserver v0.29.3 // indirect
122+
k8s.io/client-go v0.29.3 // indirect
123+
k8s.io/cluster-bootstrap v0.29.3 // indirect
124+
k8s.io/component-base v0.29.3 // indirect
74125
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
75126
k8s.io/klog v0.2.0 // indirect
76127
k8s.io/klog/v2 v2.110.1 // indirect
77128
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
78-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
129+
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
130+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
131+
sigs.k8s.io/cluster-api v1.7.2 // indirect
132+
sigs.k8s.io/controller-runtime v0.17.3 // indirect
79133
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
80134
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d // indirect
81135
sigs.k8s.io/kustomize/api v0.15.0 // indirect
@@ -84,3 +138,5 @@ require (
84138
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
85139
sigs.k8s.io/yaml v1.4.0 // indirect
86140
)
141+
142+
replace sigs.k8s.io/cluster-api-provider-openstack => ../..

0 commit comments

Comments
 (0)