Skip to content
This repository was archived by the owner on Apr 17, 2025. It is now read-only.

Commit ca6620b

Browse files
committed
Update to controller-tools 0.14.0
This updates golang.org/x/tools to a later version which fixes the crash in kubernetes-sigs/controller-tools#880, which I believe is what is happening on the current main branch in this repository.
1 parent a0351d2 commit ca6620b

File tree

2 files changed

+224
-197
lines changed

2 files changed

+224
-197
lines changed

go.mod

+61-59
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ go 1.20
55
require (
66
contrib.go.opencensus.io/exporter/prometheus v0.4.0
77
contrib.go.opencensus.io/exporter/stackdriver v0.13.0
8-
github.com/go-logr/logr v1.2.4
8+
github.com/go-logr/logr v1.3.0
99
github.com/go-logr/zapr v1.2.4
1010
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
11-
github.com/onsi/ginkgo/v2 v2.9.2
12-
github.com/onsi/gomega v1.27.6
11+
github.com/onsi/ginkgo/v2 v2.13.0
12+
github.com/onsi/gomega v1.30.0
1313
github.com/open-policy-agent/cert-controller v0.6.0
14-
github.com/spf13/cobra v1.7.0
14+
github.com/spf13/cobra v1.8.0
1515
go.opencensus.io v0.24.0
1616
go.uber.org/zap v1.24.0
1717
honnef.co/go/tools v0.4.0
18-
k8s.io/api v0.26.5
19-
k8s.io/apiextensions-apiserver v0.26.5
20-
k8s.io/apimachinery v0.26.5
18+
k8s.io/api v0.29.0
19+
k8s.io/apiextensions-apiserver v0.29.0
20+
k8s.io/apimachinery v0.29.0
2121
k8s.io/cli-runtime v0.26.5
22-
k8s.io/client-go v0.26.5
22+
k8s.io/client-go v0.29.0
2323
sigs.k8s.io/controller-runtime v0.14.6
24-
sigs.k8s.io/controller-tools v0.11.4
24+
sigs.k8s.io/controller-tools v0.14.0
2525
)
2626

2727
require (
@@ -32,24 +32,24 @@ require (
3232
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3333
github.com/davecgh/go-spew v1.1.1 // indirect
3434
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
35-
github.com/fatih/color v1.15.0 // indirect
36-
github.com/fsnotify/fsnotify v1.6.0 // indirect
35+
github.com/fatih/color v1.16.0 // indirect
36+
github.com/fsnotify/fsnotify v1.7.0 // indirect
3737
github.com/go-errors/errors v1.0.1 // indirect
38-
github.com/go-kit/log v0.2.0 // indirect
38+
github.com/go-kit/log v0.2.1 // indirect
3939
github.com/go-logfmt/logfmt v0.5.1 // indirect
4040
github.com/go-openapi/jsonpointer v0.19.6 // indirect
41-
github.com/go-openapi/jsonreference v0.20.1 // indirect
41+
github.com/go-openapi/jsonreference v0.20.2 // indirect
4242
github.com/go-openapi/swag v0.22.3 // indirect
4343
github.com/gobuffalo/flect v1.0.2 // indirect
4444
github.com/gogo/protobuf v1.3.2 // indirect
4545
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4646
github.com/golang/protobuf v1.5.3 // indirect
4747
github.com/google/btree v1.0.1 // indirect
48-
github.com/google/go-cmp v0.5.9 // indirect
48+
github.com/google/go-cmp v0.6.0 // indirect
4949
github.com/google/gofuzz v1.2.0 // indirect
5050
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
5151
github.com/google/uuid v1.3.0 // indirect
52-
github.com/googleapis/gax-go/v2 v2.8.0 // indirect
52+
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
5353
github.com/imdario/mergo v0.3.12 // indirect
5454
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5555
github.com/jmespath/go-jmespath v0.4.0 // indirect
@@ -58,93 +58,95 @@ require (
5858
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
5959
github.com/mailru/easyjson v0.7.7 // indirect
6060
github.com/mattn/go-colorable v0.1.13 // indirect
61-
github.com/mattn/go-isatty v0.0.17 // indirect
62-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
61+
github.com/mattn/go-isatty v0.0.20 // indirect
62+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
6363
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6464
github.com/modern-go/reflect2 v1.0.2 // indirect
6565
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
6666
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
6767
github.com/pkg/errors v0.9.1 // indirect
68-
github.com/prometheus/client_golang v1.14.0 // indirect
69-
github.com/prometheus/client_model v0.3.0 // indirect
70-
github.com/prometheus/common v0.37.0 // indirect
71-
github.com/prometheus/procfs v0.8.0 // indirect
68+
github.com/prometheus/client_golang v1.16.0 // indirect
69+
github.com/prometheus/client_model v0.4.0 // indirect
70+
github.com/prometheus/common v0.44.0 // indirect
71+
github.com/prometheus/procfs v0.10.1 // indirect
7272
github.com/prometheus/statsd_exporter v0.21.0 // indirect
7373
github.com/spf13/pflag v1.0.5 // indirect
7474
github.com/xlab/treeprint v1.1.0 // indirect
7575
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
7676
go.uber.org/atomic v1.11.0 // indirect
7777
go.uber.org/multierr v1.11.0 // indirect
78-
golang.org/x/crypto v0.7.0 // indirect
78+
golang.org/x/crypto v0.16.0 // indirect
7979
golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
80-
golang.org/x/mod v0.10.0 // indirect
81-
golang.org/x/net v0.9.0 // indirect
82-
golang.org/x/oauth2 v0.7.0 // indirect
83-
golang.org/x/sync v0.1.0
84-
golang.org/x/sys v0.7.0 // indirect
85-
golang.org/x/term v0.7.0 // indirect
86-
golang.org/x/text v0.9.0
80+
golang.org/x/mod v0.14.0 // indirect
81+
golang.org/x/net v0.19.0 // indirect
82+
golang.org/x/oauth2 v0.10.0 // indirect
83+
golang.org/x/sync v0.5.0
84+
golang.org/x/sys v0.15.0 // indirect
85+
golang.org/x/term v0.15.0 // indirect
86+
golang.org/x/text v0.14.0
8787
golang.org/x/time v0.3.0 // indirect
88-
golang.org/x/tools v0.8.0 // indirect
88+
golang.org/x/tools v0.16.1 // indirect
8989
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
90-
google.golang.org/api v0.118.0 // indirect
90+
google.golang.org/api v0.126.0 // indirect
9191
google.golang.org/appengine v1.6.7 // indirect
92-
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
93-
google.golang.org/grpc v1.55.0 // indirect
94-
google.golang.org/protobuf v1.30.0 // indirect
92+
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
93+
google.golang.org/grpc v1.58.3 // indirect
94+
google.golang.org/protobuf v1.31.0 // indirect
9595
gopkg.in/inf.v0 v0.9.1 // indirect
9696
gopkg.in/yaml.v2 v2.4.0 // indirect
9797
gopkg.in/yaml.v3 v3.0.1 // indirect
98-
k8s.io/component-base v0.26.5 // indirect
99-
k8s.io/klog/v2 v2.90.1 // indirect
100-
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
101-
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
98+
k8s.io/component-base v0.29.0 // indirect
99+
k8s.io/klog/v2 v2.110.1 // indirect
100+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
101+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
102102
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
103103
sigs.k8s.io/kustomize/api v0.12.1 // indirect
104104
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
105-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
106-
sigs.k8s.io/yaml v1.3.0 // indirect
105+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
106+
sigs.k8s.io/yaml v1.4.0 // indirect
107107
)
108108

109109
require (
110-
github.com/stretchr/testify v1.8.1
110+
github.com/stretchr/testify v1.8.4
111111
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230524200249-30eae58f1b98
112112
)
113113

114114
require (
115-
cloud.google.com/go/compute v1.19.0 // indirect
115+
cloud.google.com/go/compute v1.23.0 // indirect
116116
cloud.google.com/go/compute/metadata v0.2.3 // indirect
117-
cloud.google.com/go/container v1.18.1 // indirect
118-
cloud.google.com/go/monitoring v1.14.0 // indirect
119-
cloud.google.com/go/trace v1.9.1 // indirect
120-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
117+
cloud.google.com/go/container v1.24.0 // indirect
118+
cloud.google.com/go/monitoring v1.15.1 // indirect
119+
cloud.google.com/go/trace v1.10.1 // indirect
120+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
121121
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
122122
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
123123
github.com/google/gnostic v0.5.7-v3refs // indirect
124124
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
125-
github.com/google/s2a-go v0.1.0 // indirect
125+
github.com/google/s2a-go v0.1.4 // indirect
126126
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
127127
github.com/gorilla/mux v1.8.0
128128
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
129129
github.com/spf13/afero v1.9.5 // indirect
130-
k8s.io/apiserver v0.26.5
130+
k8s.io/apiserver v0.29.0
131131
k8s.io/kube-aggregator v0.23.2
132132
)
133133

134134
require (
135135
github.com/blang/semver/v4 v4.0.0 // indirect
136-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
136+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
137137
github.com/felixge/httpsnoop v1.0.3 // indirect
138138
github.com/go-logr/stdr v1.2.2 // indirect
139-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
139+
github.com/google/gnostic-models v0.6.8 // indirect
140+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
140141
github.com/pmezard/go-difflib v1.0.0 // indirect
141-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
142-
go.opentelemetry.io/otel v1.10.0 // indirect
143-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
144-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
145-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
146-
go.opentelemetry.io/otel/metric v0.31.0 // indirect
147-
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
148-
go.opentelemetry.io/otel/trace v1.10.0 // indirect
149-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
142+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
143+
go.opentelemetry.io/otel v1.19.0 // indirect
144+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
145+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
146+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
147+
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
148+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
149+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
150+
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
151+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
150152
)

0 commit comments

Comments
 (0)