Skip to content

Commit e72a847

Browse files
Merge pull request #72 from damdo/bump-k8s-1.34
OCPCLOUD-3090: Bump k8s dependencies to 1.34
2 parents 03d7a96 + cd2234e commit e72a847

1,190 files changed

Lines changed: 91105 additions & 32819 deletions

File tree

Some content is hidden

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

go.mod

Lines changed: 55 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,30 @@ require (
88
github.com/IBM/vpc-go-sdk v0.64.0
99
github.com/blang/semver v3.5.1+incompatible
1010
github.com/coreos/ignition/v2 v2.20.0
11-
github.com/go-logr/logr v1.4.2
11+
github.com/go-logr/logr v1.4.3
1212
github.com/golang-jwt/jwt v3.2.2+incompatible
1313
github.com/golang/mock v1.6.0
14-
github.com/onsi/ginkgo/v2 v2.23.4
15-
github.com/onsi/gomega v1.38.0
16-
github.com/openshift/api v0.0.0-20250710004639-926605d3338b
17-
github.com/openshift/library-go v0.0.0-20250724123005-03d85c4e997c
18-
github.com/openshift/machine-api-operator v0.2.1-0.20250704070513-81d86b5a1ef5
19-
k8s.io/api v0.33.3
20-
k8s.io/apimachinery v0.33.3
21-
k8s.io/apiserver v0.33.3
22-
k8s.io/client-go v0.33.3
23-
k8s.io/component-base v0.33.3
14+
github.com/onsi/ginkgo/v2 v2.27.2
15+
github.com/onsi/gomega v1.38.2
16+
github.com/openshift/api v0.0.0-20251111193948-50e2ece149d7
17+
github.com/openshift/library-go v0.0.0-20251112091634-ab97ebb73f0f
18+
github.com/openshift/machine-api-operator v0.2.1-0.20251114003056-6bdd14cde930
19+
k8s.io/api v0.34.1
20+
k8s.io/apimachinery v0.34.1
21+
k8s.io/apiserver v0.34.1
22+
k8s.io/client-go v0.34.1
23+
k8s.io/component-base v0.34.1
2424
k8s.io/klog/v2 v2.130.1
25-
k8s.io/utils v0.0.0-20241210054802-24370beab758
26-
sigs.k8s.io/controller-runtime v0.21.0
27-
sigs.k8s.io/controller-tools v0.17.1
28-
sigs.k8s.io/yaml v1.4.0
25+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
26+
sigs.k8s.io/controller-runtime v0.22.4
27+
sigs.k8s.io/controller-tools v0.19.0
28+
sigs.k8s.io/yaml v1.6.0
2929
)
3030

3131
require (
3232
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
3333
github.com/MakeNowJust/heredoc v1.0.0 // indirect
34+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
3435
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3536
github.com/beorn7/perks v1.0.1 // indirect
3637
github.com/blang/semver/v4 v4.0.0 // indirect
@@ -40,12 +41,12 @@ require (
4041
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4142
github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 // indirect
4243
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
43-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
44+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
4445
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
4546
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
4647
github.com/fatih/color v1.18.0 // indirect
47-
github.com/fsnotify/fsnotify v1.8.0 // indirect
48-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
48+
github.com/fsnotify/fsnotify v1.9.0 // indirect
49+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
4950
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
5051
github.com/go-errors/errors v1.4.2 // indirect
5152
github.com/go-openapi/errors v0.22.0 // indirect
@@ -60,10 +61,9 @@ require (
6061
github.com/gobuffalo/flect v1.0.3 // indirect
6162
github.com/gogo/protobuf v1.3.2 // indirect
6263
github.com/google/btree v1.1.3 // indirect
63-
github.com/google/gnostic-models v0.6.9 // indirect
64+
github.com/google/gnostic-models v0.7.0 // indirect
6465
github.com/google/go-cmp v0.7.0 // indirect
6566
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
66-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
6767
github.com/google/uuid v1.6.0 // indirect
6868
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
6969
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
@@ -75,58 +75,62 @@ require (
7575
github.com/leodido/go-urn v1.4.0 // indirect
7676
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
7777
github.com/mailru/easyjson v0.7.7 // indirect
78-
github.com/mattn/go-colorable v0.1.13 // indirect
78+
github.com/mattn/go-colorable v0.1.14 // indirect
7979
github.com/mattn/go-isatty v0.0.20 // indirect
8080
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
8181
github.com/mitchellh/mapstructure v1.5.0 // indirect
8282
github.com/moby/spdystream v0.5.0 // indirect
8383
github.com/moby/term v0.5.0 // indirect
8484
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
85-
github.com/modern-go/reflect2 v1.0.2 // indirect
85+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
8686
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
8787
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8888
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
8989
github.com/oklog/ulid v1.3.1 // indirect
90-
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee // indirect
90+
github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235 // indirect
9191
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
9292
github.com/pkg/errors v0.9.1 // indirect
93-
github.com/prometheus/client_golang v1.22.0 // indirect
94-
github.com/prometheus/client_model v0.6.1 // indirect
95-
github.com/prometheus/common v0.62.0 // indirect
96-
github.com/prometheus/procfs v0.15.1 // indirect
93+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
94+
github.com/prometheus/client_golang v1.23.2 // indirect
95+
github.com/prometheus/client_model v0.6.2 // indirect
96+
github.com/prometheus/common v0.66.1 // indirect
97+
github.com/prometheus/procfs v0.16.1 // indirect
9798
github.com/russross/blackfriday/v2 v2.1.0 // indirect
98-
github.com/spf13/cobra v1.8.1 // indirect
99-
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
99+
github.com/spf13/cobra v1.10.1 // indirect
100+
github.com/spf13/pflag v1.0.10 // indirect
100101
github.com/vincent-petithory/dataurl v1.0.0 // indirect
101102
github.com/x448/float16 v0.8.4 // indirect
102103
github.com/xlab/treeprint v1.2.0 // indirect
103104
go.mongodb.org/mongo-driver v1.14.0 // indirect
104-
go.opentelemetry.io/otel v1.33.0 // indirect
105-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
106-
go.uber.org/automaxprocs v1.6.0 // indirect
107-
golang.org/x/crypto v0.39.0 // indirect
108-
golang.org/x/mod v0.25.0 // indirect
109-
golang.org/x/net v0.41.0 // indirect
110-
golang.org/x/oauth2 v0.27.0 // indirect
111-
golang.org/x/sync v0.15.0 // indirect
112-
golang.org/x/sys v0.33.0 // indirect
113-
golang.org/x/term v0.32.0 // indirect
114-
golang.org/x/text v0.26.0 // indirect
115-
golang.org/x/time v0.9.0 // indirect
116-
golang.org/x/tools v0.33.0 // indirect
117-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
118-
google.golang.org/protobuf v1.36.6 // indirect
105+
go.opentelemetry.io/otel v1.35.0 // indirect
106+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
107+
go.yaml.in/yaml/v2 v2.4.2 // indirect
108+
go.yaml.in/yaml/v3 v3.0.4 // indirect
109+
golang.org/x/crypto v0.43.0 // indirect
110+
golang.org/x/mod v0.28.0 // indirect
111+
golang.org/x/net v0.46.0 // indirect
112+
golang.org/x/oauth2 v0.30.0 // indirect
113+
golang.org/x/sync v0.17.0 // indirect
114+
golang.org/x/sys v0.37.0 // indirect
115+
golang.org/x/term v0.36.0 // indirect
116+
golang.org/x/text v0.30.0 // indirect
117+
golang.org/x/time v0.14.0 // indirect
118+
golang.org/x/tools v0.37.0 // indirect
119+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
120+
google.golang.org/protobuf v1.36.8 // indirect
119121
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
120122
gopkg.in/inf.v0 v0.9.1 // indirect
121123
gopkg.in/yaml.v2 v2.4.0 // indirect
122124
gopkg.in/yaml.v3 v3.0.1 // indirect
123-
k8s.io/apiextensions-apiserver v0.33.3 // indirect
124-
k8s.io/cli-runtime v0.33.3 // indirect
125-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
126-
k8s.io/kubectl v0.33.3 // indirect
125+
k8s.io/apiextensions-apiserver v0.34.1 // indirect
126+
k8s.io/cli-runtime v0.34.1 // indirect
127+
k8s.io/code-generator v0.34.1 // indirect
128+
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
129+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
130+
k8s.io/kubectl v0.34.1 // indirect
127131
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
128-
sigs.k8s.io/kustomize/api v0.19.0 // indirect
129-
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
132+
sigs.k8s.io/kustomize/api v0.20.1 // indirect
133+
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
130134
sigs.k8s.io/randfill v1.0.0 // indirect
131-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
135+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
132136
)

0 commit comments

Comments
 (0)