Skip to content

Commit 83b017b

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2478 from JoelSpeed/update-controller-tools
Update controller-tools to latest on fork
2 parents 94481d7 + b6f0e27 commit 83b017b

File tree

699 files changed

+63231
-25175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

699 files changed

+63231
-25175
lines changed

‎tools/go.mod‎

Lines changed: 48 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,29 @@ require (
1717
github.com/russross/blackfriday v2.0.0+incompatible
1818
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3
1919
github.com/spf13/cobra v1.9.1
20-
github.com/spf13/pflag v1.0.6
20+
github.com/spf13/pflag v1.0.7
2121
github.com/vmware-archive/yaml-patch v0.0.11
22-
golang.org/x/tools v0.32.0
22+
golang.org/x/tools v0.35.0
2323
gopkg.in/yaml.v3 v3.0.1
24-
k8s.io/apiextensions-apiserver v0.33.2
25-
k8s.io/apimachinery v0.33.2
26-
k8s.io/code-generator v0.33.2
24+
k8s.io/apiextensions-apiserver v0.34.0-beta.0
25+
k8s.io/apimachinery v0.34.0-beta.0
26+
k8s.io/code-generator v0.34.0-beta.0
2727
k8s.io/gengo v0.0.0-20250704022524-ddb642e17a28
28-
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7
28+
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f
2929
k8s.io/klog/v2 v2.130.1
30-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
30+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
3131
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
32-
sigs.k8s.io/controller-tools v0.15.0
32+
sigs.k8s.io/controller-tools v0.18.0
3333
sigs.k8s.io/kube-api-linter v0.0.0-20250808120943-48643eb2563d
34-
sigs.k8s.io/yaml v1.4.0
34+
sigs.k8s.io/yaml v1.6.0
3535
)
3636

37-
replace sigs.k8s.io/controller-tools => github.com/openshift/controller-tools v0.12.1-0.20250402141027-24f590ca0886
37+
replace sigs.k8s.io/controller-tools => github.com/openshift/controller-tools v0.12.1-0.20250801155905-948121310243
3838

3939
require (
4040
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
4141
4d63.com/gochecknoglobals v0.2.2 // indirect
42-
cel.dev/expr v0.19.1 // indirect
42+
cel.dev/expr v0.23.1 // indirect
4343
cloud.google.com/go v0.116.0 // indirect
4444
cloud.google.com/go/auth v0.15.0 // indirect
4545
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
@@ -55,11 +55,11 @@ require (
5555
github.com/BurntSushi/toml v1.5.0 // indirect
5656
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
5757
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.1 // indirect
58-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
58+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect
5959
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
6060
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
6161
github.com/Masterminds/semver/v3 v3.3.1 // indirect
62-
github.com/Microsoft/go-winio v0.6.1 // indirect
62+
github.com/Microsoft/go-winio v0.6.2 // indirect
6363
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
6464
github.com/ProtonMail/go-crypto v1.0.0 // indirect
6565
github.com/a8m/envsubst v1.4.2 // indirect
@@ -96,7 +96,7 @@ require (
9696
github.com/chavacava/garif v0.1.0 // indirect
9797
github.com/ckaznocha/intrange v0.3.1 // indirect
9898
github.com/cloudflare/circl v1.3.7 // indirect
99-
github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3 // indirect
99+
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
100100
github.com/curioswitch/go-reassign v0.3.0 // indirect
101101
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
102102
github.com/daixiang0/gci v0.13.6 // indirect
@@ -105,7 +105,7 @@ require (
105105
github.com/dimchansky/utfbom v1.1.1 // indirect
106106
github.com/dlclark/regexp2 v1.11.5 // indirect
107107
github.com/elliotchance/orderedmap v1.6.0 // indirect
108-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
108+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
109109
github.com/emirpasic/gods v1.18.1 // indirect
110110
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
111111
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
@@ -114,13 +114,14 @@ require (
114114
github.com/fatih/structtag v1.2.0 // indirect
115115
github.com/felixge/httpsnoop v1.0.4 // indirect
116116
github.com/firefart/nonamedreturns v1.0.6 // indirect
117-
github.com/fsnotify/fsnotify v1.7.0 // indirect
118-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
117+
github.com/fsnotify/fsnotify v1.9.0 // indirect
118+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
119119
github.com/fzipp/gocyclo v0.6.0 // indirect
120120
github.com/ghostiam/protogetter v0.3.15 // indirect
121121
github.com/go-critic/go-critic v0.13.0 // indirect
122122
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
123123
github.com/go-git/go-billy/v5 v5.5.0 // indirect
124+
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
124125
github.com/go-logr/logr v1.4.2 // indirect
125126
github.com/go-logr/stdr v1.2.2 // indirect
126127
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -149,8 +150,8 @@ require (
149150
github.com/golangci/plugin-module-register v0.1.1 // indirect
150151
github.com/golangci/revgrep v0.8.0 // indirect
151152
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
152-
github.com/google/cel-go v0.23.2 // indirect
153-
github.com/google/gnostic-models v0.6.9 // indirect
153+
github.com/google/cel-go v0.25.0 // indirect
154+
github.com/google/gnostic-models v0.7.0 // indirect
154155
github.com/google/s2a-go v0.1.9 // indirect
155156
github.com/google/uuid v1.6.0 // indirect
156157
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
@@ -160,7 +161,7 @@ require (
160161
github.com/gostaticanalysis/comment v1.5.0 // indirect
161162
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
162163
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
163-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
164+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
164165
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
165166
github.com/hashicorp/go-version v1.7.0 // indirect
166167
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
@@ -205,7 +206,7 @@ require (
205206
github.com/mitchellh/go-homedir v1.1.0 // indirect
206207
github.com/mitchellh/mapstructure v1.5.0 // indirect
207208
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
208-
github.com/modern-go/reflect2 v1.0.2 // indirect
209+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
209210
github.com/moricho/tparallel v0.3.2 // indirect
210211
github.com/muesli/termenv v0.16.0 // indirect
211212
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -249,6 +250,7 @@ require (
249250
github.com/spf13/cast v1.5.0 // indirect
250251
github.com/spf13/jwalterweatherman v1.1.0 // indirect
251252
github.com/spf13/viper v1.12.0 // indirect
253+
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
252254
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
253255
github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
254256
github.com/stoewer/go-strcase v1.3.0 // indirect
@@ -273,57 +275,60 @@ require (
273275
github.com/yeya24/promlinter v0.3.0 // indirect
274276
github.com/ykadowak/zerologlint v0.1.5 // indirect
275277
github.com/yuin/gopher-lua v1.1.1 // indirect
278+
github.com/zeebo/errs v1.4.0 // indirect
276279
gitlab.com/bosi/decorder v0.4.2 // indirect
277280
go-simpler.org/musttag v0.13.1 // indirect
278281
go-simpler.org/sloglint v0.11.0 // indirect
279282
go.augendre.info/fatcontext v0.8.0 // indirect
280283
go.opencensus.io v0.24.0 // indirect
281284
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
282285
go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
283-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
286+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
284287
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
285-
go.opentelemetry.io/otel v1.34.0 // indirect
286-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
287-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
288-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
288+
go.opentelemetry.io/otel v1.35.0 // indirect
289+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
290+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
291+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
289292
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
290293
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
291-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
292-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
294+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
295+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
293296
go.uber.org/automaxprocs v1.6.0 // indirect
294297
go.uber.org/multierr v1.11.0 // indirect
295298
go.uber.org/zap v1.27.0 // indirect
296-
golang.org/x/crypto v0.37.0 // indirect
299+
go.yaml.in/yaml/v2 v2.4.2 // indirect
300+
go.yaml.in/yaml/v3 v3.0.4 // indirect
301+
golang.org/x/crypto v0.40.0 // indirect
297302
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
298303
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
299-
golang.org/x/mod v0.24.0 // indirect
300-
golang.org/x/net v0.39.0 // indirect
304+
golang.org/x/mod v0.26.0 // indirect
305+
golang.org/x/net v0.42.0 // indirect
301306
golang.org/x/oauth2 v0.28.0 // indirect
302-
golang.org/x/sync v0.13.0 // indirect
303-
golang.org/x/sys v0.32.0 // indirect
304-
golang.org/x/term v0.31.0 // indirect
305-
golang.org/x/text v0.24.0 // indirect
307+
golang.org/x/sync v0.16.0 // indirect
308+
golang.org/x/sys v0.34.0 // indirect
309+
golang.org/x/term v0.33.0 // indirect
310+
golang.org/x/text v0.27.0 // indirect
306311
golang.org/x/time v0.11.0 // indirect
307312
google.golang.org/api v0.228.0 // indirect
308313
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
309-
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
314+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
310315
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
311-
google.golang.org/grpc v1.71.0 // indirect
316+
google.golang.org/grpc v1.72.1 // indirect
312317
google.golang.org/protobuf v1.36.6 // indirect
313318
gopkg.in/inf.v0 v0.9.1 // indirect
314319
gopkg.in/ini.v1 v1.67.0 // indirect
315320
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
316321
gopkg.in/warnings.v0 v0.1.2 // indirect
317322
gopkg.in/yaml.v2 v2.4.0 // indirect
318323
honnef.co/go/tools v0.6.1 // indirect
319-
k8s.io/api v0.33.2 // indirect
320-
k8s.io/apiserver v0.33.2 // indirect
321-
k8s.io/client-go v0.33.2 // indirect
322-
k8s.io/component-base v0.33.2 // indirect
324+
k8s.io/api v0.34.0-beta.0 // indirect
325+
k8s.io/apiserver v0.34.0-beta.0 // indirect
326+
k8s.io/client-go v0.34.0-beta.0 // indirect
327+
k8s.io/component-base v0.34.0-beta.0 // indirect
323328
mvdan.cc/gofumpt v0.8.0 // indirect
324329
mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4 // indirect
325330
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
326-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
331+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
327332
sigs.k8s.io/randfill v1.0.0 // indirect
328-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
333+
sigs.k8s.io/structured-merge-diff/v6 v6.2.0 // indirect
329334
)

0 commit comments

Comments
 (0)