Skip to content

Commit ffe5113

Browse files
Merge pull request #888 from bertinatto/rebase-1.34
OCPSTRAT-2371: Update to Kubernetes v1.34.1
2 parents 52b7857 + 6b9feeb commit ffe5113

File tree

1,308 files changed

+110193
-37336
lines changed

Some content is hidden

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

1,308 files changed

+110193
-37336
lines changed

go.mod

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@ require (
99
github.com/onsi/ginkgo/v2 v2.22.1
1010
github.com/onsi/gomega v1.36.1
1111
github.com/openshift-eng/openshift-tests-extension v0.0.0-20250804142706-7b3ab438a292
12-
github.com/openshift/api v0.0.0-20250710004639-926605d3338b
12+
github.com/openshift/api v0.0.0-20251015095338-264e80a2b6e7
1313
github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee
14-
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee
15-
github.com/openshift/library-go v0.0.0-20250812160438-378de074fe7b
14+
github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235
15+
github.com/openshift/library-go v0.0.0-20251015151611-6fc7a74b67c5
1616
github.com/prometheus/client_golang v1.22.0
1717
github.com/prometheus/common v0.62.0
18-
github.com/spf13/cobra v1.8.1
19-
github.com/spf13/pflag v1.0.5
18+
github.com/spf13/cobra v1.9.1
19+
github.com/spf13/pflag v1.0.6
2020
github.com/stretchr/testify v1.10.0
2121
google.golang.org/protobuf v1.36.5 // indirect; to improve error handling
22-
k8s.io/api v0.33.2
23-
k8s.io/apimachinery v0.33.2
24-
k8s.io/apiserver v0.33.2
25-
k8s.io/client-go v0.33.2
26-
k8s.io/component-base v0.33.2
22+
k8s.io/api v0.34.1
23+
k8s.io/apimachinery v0.34.1
24+
k8s.io/apiserver v0.34.1
25+
k8s.io/client-go v0.34.1
26+
k8s.io/component-base v0.34.1
2727
k8s.io/klog/v2 v2.130.1
28-
k8s.io/utils v0.0.0-20241210054802-24370beab758
28+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
2929
)
3030

3131
require (
32-
cel.dev/expr v0.19.1 // indirect
32+
cel.dev/expr v0.24.0 // indirect
3333
github.com/NYTimes/gziphandler v1.1.1 // indirect
3434
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
3535
github.com/beorn7/perks v1.0.1 // indirect
@@ -39,11 +39,11 @@ require (
3939
github.com/coreos/go-semver v0.3.1 // indirect
4040
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4141
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
42-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
42+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
4343
github.com/felixge/fgprof v0.9.4 // indirect
4444
github.com/felixge/httpsnoop v1.0.4 // indirect
45-
github.com/fsnotify/fsnotify v1.7.0 // indirect
46-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
45+
github.com/fsnotify/fsnotify v1.9.0 // indirect
46+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
4747
github.com/go-logr/logr v1.4.2 // indirect
4848
github.com/go-logr/stdr v1.2.2 // indirect
4949
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -58,20 +58,20 @@ require (
5858
github.com/gonum/lapack v0.0.0-20181123203213-e4cdc5a0bff9 // indirect
5959
github.com/gonum/matrix v0.0.0-20181209220409-c518dec07be9 // indirect
6060
github.com/google/btree v1.1.3 // indirect
61-
github.com/google/cel-go v0.23.2 // indirect
62-
github.com/google/gnostic-models v0.6.9 // indirect
61+
github.com/google/cel-go v0.26.0 // indirect
62+
github.com/google/gnostic-models v0.7.0 // indirect
6363
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
6464
github.com/google/uuid v1.6.0 // indirect
6565
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
66-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
66+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
6767
github.com/imdario/mergo v0.3.7 // indirect
6868
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6969
github.com/josharian/intern v1.0.0 // indirect
7070
github.com/json-iterator/go v1.1.12 // indirect
7171
github.com/kylelemons/godebug v1.1.0 // indirect
7272
github.com/mailru/easyjson v0.7.7 // indirect
7373
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
74-
github.com/modern-go/reflect2 v1.0.2 // indirect
74+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
7575
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7676
github.com/pkg/errors v0.9.1 // indirect
7777
github.com/pkg/profile v1.7.0 // indirect
@@ -82,49 +82,51 @@ require (
8282
github.com/sirupsen/logrus v1.9.3 // indirect
8383
github.com/stoewer/go-strcase v1.3.0 // indirect
8484
github.com/x448/float16 v0.8.4 // indirect
85-
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
86-
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
87-
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
85+
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
86+
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
87+
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
8888
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
89-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
89+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
9090
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
91-
go.opentelemetry.io/otel v1.33.0 // indirect
92-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
93-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
94-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
95-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
96-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
97-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
91+
go.opentelemetry.io/otel v1.35.0 // indirect
92+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
93+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
94+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
95+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
96+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
97+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
9898
go.uber.org/multierr v1.11.0 // indirect
9999
go.uber.org/zap v1.27.0 // indirect
100-
golang.org/x/crypto v0.36.0 // indirect
100+
go.yaml.in/yaml/v2 v2.4.2 // indirect
101+
go.yaml.in/yaml/v3 v3.0.4 // indirect
102+
golang.org/x/crypto v0.42.0 // indirect
101103
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
102-
golang.org/x/net v0.38.0 // indirect
104+
golang.org/x/net v0.43.0 // indirect
103105
golang.org/x/oauth2 v0.27.0 // indirect
104-
golang.org/x/sync v0.12.0 // indirect
105-
golang.org/x/sys v0.31.0 // indirect
106-
golang.org/x/term v0.30.0 // indirect
107-
golang.org/x/text v0.23.0 // indirect
106+
golang.org/x/sync v0.17.0 // indirect
107+
golang.org/x/sys v0.36.0 // indirect
108+
golang.org/x/term v0.35.0 // indirect
109+
golang.org/x/text v0.29.0 // indirect
108110
golang.org/x/time v0.9.0 // indirect
109-
golang.org/x/tools v0.28.0 // indirect
110-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
111-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
112-
google.golang.org/grpc v1.68.1 // indirect
111+
golang.org/x/tools v0.36.0 // indirect
112+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
113+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
114+
google.golang.org/grpc v1.72.1 // indirect
113115
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
114116
gopkg.in/inf.v0 v0.9.1 // indirect
115117
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
116118
gopkg.in/yaml.v2 v2.4.0 // indirect
117119
gopkg.in/yaml.v3 v3.0.1 // indirect
118-
k8s.io/apiextensions-apiserver v0.33.2 // indirect
119-
k8s.io/kms v0.33.2 // indirect
120-
k8s.io/kube-aggregator v0.33.2 // indirect
121-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
120+
k8s.io/apiextensions-apiserver v0.34.1 // indirect
121+
k8s.io/kms v0.34.1 // indirect
122+
k8s.io/kube-aggregator v0.34.1 // indirect
123+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
122124
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
123125
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
124126
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
125127
sigs.k8s.io/randfill v1.0.0 // indirect
126-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
127-
sigs.k8s.io/yaml v1.4.0 // indirect
128+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
129+
sigs.k8s.io/yaml v1.6.0 // indirect
128130
)
129131

130132
// This replace is required for we use the OCP fork of Ginkgo.

0 commit comments

Comments
 (0)