Skip to content

Commit 2573c3e

Browse files
Merge pull request #156 from openshift-cloud-team/k8s-1.34
OCPCLOUD-3085: Bump k8s to 1.34
2 parents 444134d + 1a44123 commit 2573c3e

File tree

1,165 files changed

+102371
-51557
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,165 files changed

+102371
-51557
lines changed

go.mod

Lines changed: 54 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,42 @@ module github.com/openshift/machine-api-provider-aws
33
go 1.24.0
44

55
require (
6-
github.com/aws/aws-sdk-go v1.55.7
6+
github.com/aws/aws-sdk-go v1.55.8
77
github.com/blang/semver v3.5.1+incompatible
8-
github.com/go-logr/logr v1.4.2
8+
github.com/go-logr/logr v1.4.3
99
github.com/golang/mock v1.6.0
10-
github.com/onsi/ginkgo/v2 v2.23.4
11-
github.com/onsi/gomega v1.37.0
12-
github.com/openshift/api v0.0.0-20251009093019-7837a801e8c1
13-
github.com/openshift/library-go v0.0.0-20250711143941-47604345e7ea
14-
github.com/openshift/machine-api-operator v0.2.1-0.20250721183005-388c07321caf
15-
k8s.io/api v0.33.3
16-
k8s.io/apimachinery v0.33.3
17-
k8s.io/apiserver v0.33.3
18-
k8s.io/client-go v0.33.3
19-
k8s.io/component-base v0.33.3
10+
github.com/onsi/ginkgo/v2 v2.27.2
11+
github.com/onsi/gomega v1.38.2
12+
github.com/openshift/api v0.0.0-20251106190826-ebe535b08719
13+
github.com/openshift/library-go v0.0.0-20251107090138-0de9712313a5
14+
github.com/openshift/machine-api-operator v0.2.1-0.20251110092458-e0af0f3f44b8
15+
k8s.io/api v0.34.1
16+
k8s.io/apimachinery v0.34.1
17+
k8s.io/apiserver v0.34.1
18+
k8s.io/client-go v0.34.1
19+
k8s.io/component-base v0.34.1
2020
k8s.io/klog/v2 v2.130.1
21-
k8s.io/utils v0.0.0-20241210054802-24370beab758
22-
sigs.k8s.io/controller-runtime v0.21.0
21+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
22+
sigs.k8s.io/controller-runtime v0.22.3
2323
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250520071515-71f7db556ca5
24-
sigs.k8s.io/controller-tools v0.18.0
24+
sigs.k8s.io/controller-tools v0.19.0
2525
)
2626

2727
require (
2828
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
2929
github.com/MakeNowJust/heredoc v1.0.0 // indirect
30+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
3031
github.com/beorn7/perks v1.0.1 // indirect
3132
github.com/blang/semver/v4 v4.0.0 // indirect
3233
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3334
github.com/chai2010/gettext-go v1.0.3 // indirect
3435
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
35-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
36+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
3637
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3738
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
3839
github.com/fatih/color v1.18.0 // indirect
39-
github.com/fsnotify/fsnotify v1.8.0 // indirect
40-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
40+
github.com/fsnotify/fsnotify v1.9.0 // indirect
41+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
4142
github.com/go-errors/errors v1.5.1 // indirect
4243
github.com/go-logr/zapr v1.3.0 // indirect
4344
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -47,10 +48,9 @@ require (
4748
github.com/gobuffalo/flect v1.0.3 // indirect
4849
github.com/gogo/protobuf v1.3.2 // indirect
4950
github.com/google/btree v1.1.3 // indirect
50-
github.com/google/gnostic-models v0.6.9 // indirect
51+
github.com/google/gnostic-models v0.7.0 // indirect
5152
github.com/google/go-cmp v0.7.0 // indirect
5253
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
53-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
5454
github.com/google/uuid v1.6.0 // indirect
5555
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
5656
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
@@ -66,53 +66,55 @@ require (
6666
github.com/moby/spdystream v0.5.0 // indirect
6767
github.com/moby/term v0.5.2 // indirect
6868
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
69-
github.com/modern-go/reflect2 v1.0.2 // indirect
69+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
7070
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
7171
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7272
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
73-
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee // indirect
73+
github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235 // indirect
7474
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7575
github.com/pkg/errors v0.9.1 // indirect
76-
github.com/prometheus/client_golang v1.22.0 // indirect
77-
github.com/prometheus/client_model v0.6.1 // indirect
78-
github.com/prometheus/common v0.62.0 // indirect
79-
github.com/prometheus/procfs v0.15.1 // indirect
76+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
77+
github.com/prometheus/client_golang v1.23.2 // indirect
78+
github.com/prometheus/client_model v0.6.2 // indirect
79+
github.com/prometheus/common v0.66.1 // indirect
80+
github.com/prometheus/procfs v0.16.1 // indirect
8081
github.com/russross/blackfriday/v2 v2.1.0 // indirect
8182
github.com/spf13/afero v1.12.0 // indirect
82-
github.com/spf13/cobra v1.9.1 // indirect
83-
github.com/spf13/pflag v1.0.6 // indirect
83+
github.com/spf13/cobra v1.10.1 // indirect
84+
github.com/spf13/pflag v1.0.10 // indirect
8485
github.com/x448/float16 v0.8.4 // indirect
8586
github.com/xlab/treeprint v1.2.0 // indirect
86-
go.opentelemetry.io/otel v1.34.0 // indirect
87-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
88-
go.uber.org/automaxprocs v1.6.0 // indirect
87+
go.opentelemetry.io/otel v1.35.0 // indirect
88+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
8989
go.uber.org/multierr v1.11.0 // indirect
9090
go.uber.org/zap v1.27.0 // indirect
91-
golang.org/x/mod v0.24.0 // indirect
92-
golang.org/x/net v0.39.0 // indirect
93-
golang.org/x/oauth2 v0.27.0 // indirect
94-
golang.org/x/sync v0.14.0 // indirect
95-
golang.org/x/sys v0.32.0 // indirect
96-
golang.org/x/term v0.31.0 // indirect
97-
golang.org/x/text v0.25.0 // indirect
98-
golang.org/x/time v0.10.0 // indirect
99-
golang.org/x/tools v0.32.0 // indirect
100-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
101-
google.golang.org/protobuf v1.36.5 // indirect
91+
go.yaml.in/yaml/v2 v2.4.2 // indirect
92+
go.yaml.in/yaml/v3 v3.0.4 // indirect
93+
golang.org/x/mod v0.28.0 // indirect
94+
golang.org/x/net v0.46.0 // indirect
95+
golang.org/x/oauth2 v0.30.0 // indirect
96+
golang.org/x/sync v0.17.0 // indirect
97+
golang.org/x/sys v0.37.0 // indirect
98+
golang.org/x/term v0.36.0 // indirect
99+
golang.org/x/text v0.30.0 // indirect
100+
golang.org/x/time v0.14.0 // indirect
101+
golang.org/x/tools v0.37.0 // indirect
102+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
103+
google.golang.org/protobuf v1.36.8 // indirect
102104
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
103105
gopkg.in/inf.v0 v0.9.1 // indirect
104106
gopkg.in/yaml.v2 v2.4.0 // indirect
105107
gopkg.in/yaml.v3 v3.0.1 // indirect
106-
k8s.io/apiextensions-apiserver v0.33.2 // indirect
107-
k8s.io/cli-runtime v0.33.3 // indirect
108-
k8s.io/code-generator v0.33.2 // indirect
109-
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
110-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
111-
k8s.io/kubectl v0.33.3 // indirect
108+
k8s.io/apiextensions-apiserver v0.34.1 // indirect
109+
k8s.io/cli-runtime v0.34.1 // indirect
110+
k8s.io/code-generator v0.34.1 // indirect
111+
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
112+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
113+
k8s.io/kubectl v0.34.1 // indirect
112114
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
113-
sigs.k8s.io/kustomize/api v0.19.0 // indirect
114-
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
115+
sigs.k8s.io/kustomize/api v0.20.1 // indirect
116+
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
115117
sigs.k8s.io/randfill v1.0.0 // indirect
116-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
117-
sigs.k8s.io/yaml v1.4.0 // indirect
118+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
119+
sigs.k8s.io/yaml v1.6.0 // indirect
118120
)

0 commit comments

Comments
 (0)