Skip to content

Commit 4568a24

Browse files
Merge pull request #2118 from ardaguclu/k8s-1.34
CNTRLPLANE-1676: Update k8s dependencies to 1.34
2 parents e6eeeb7 + bf9e2d9 commit 4568a24

File tree

1,136 files changed

+76691
-35678
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,136 files changed

+76691
-35678
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \
1313
targets/openshift/deps-gomod.mk \
1414
)
1515

16-
KUBE_GIT_MINOR_VERSION := "33"
17-
KUBE_GIT_VERSION := "v1.33.3"
16+
KUBE_GIT_MINOR_VERSION := "34"
17+
KUBE_GIT_VERSION := "v1.34.1"
1818

1919
GO_LD_EXTRAFLAGS :=-X k8s.io/component-base/version.gitMajor="1" \
2020
-X k8s.io/component-base/version.gitMinor=$(KUBE_GIT_MINOR_VERSION) \

cmd/oc/oc.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ func main() {
4848
command := cli.CommandFor(basename)
4949
logs.AddFlags(command.PersistentFlags())
5050
injectLoglevelFlag(command.PersistentFlags())
51+
5152
if err := kcli.RunNoErrOutput(command); err != nil {
5253
// Pretty-print the error and exit with an error.
5354
kcmdutil.CheckErr(err)

go.mod

Lines changed: 44 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -38,33 +38,33 @@ require (
3838
github.com/moby/term v0.5.2
3939
github.com/opencontainers/go-digest v1.0.0
4040
github.com/opencontainers/image-spec v1.1.0
41-
github.com/openshift/api v0.0.0-20250710082954-674ad74beffc
42-
github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c
43-
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee
44-
github.com/openshift/library-go v0.0.0-20250911074910-e2c18d5abc3a
41+
github.com/openshift/api v0.0.0-20251020135558-286504b695bc
42+
github.com/openshift/build-machinery-go v0.0.0-20251020112516-49aa9f5db6d8
43+
github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235
44+
github.com/openshift/library-go v0.0.0-20251020111130-eb4177eed478
4545
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
46-
github.com/prometheus/client_golang v1.22.0
46+
github.com/prometheus/client_golang v1.23.2
4747
github.com/russross/blackfriday v1.6.0
48-
github.com/spf13/cobra v1.9.1
49-
github.com/spf13/pflag v1.0.7
48+
github.com/spf13/cobra v1.10.1
49+
github.com/spf13/pflag v1.0.10
5050
github.com/vincent-petithory/dataurl v1.0.0
51-
golang.org/x/crypto v0.42.0
52-
golang.org/x/net v0.43.0
53-
golang.org/x/oauth2 v0.30.0
51+
golang.org/x/crypto v0.43.0
52+
golang.org/x/net v0.46.0
53+
golang.org/x/oauth2 v0.32.0
5454
golang.org/x/sync v0.17.0
55-
golang.org/x/sys v0.36.0
56-
golang.org/x/term v0.35.0
57-
k8s.io/api v0.33.3
58-
k8s.io/apiextensions-apiserver v0.33.3
59-
k8s.io/apimachinery v0.33.3
60-
k8s.io/apiserver v0.33.3
61-
k8s.io/cli-runtime v0.33.3
62-
k8s.io/client-go v0.33.3
63-
k8s.io/component-base v0.33.3
55+
golang.org/x/sys v0.37.0
56+
golang.org/x/term v0.36.0
57+
k8s.io/api v0.34.1
58+
k8s.io/apiextensions-apiserver v0.34.1
59+
k8s.io/apimachinery v0.34.1
60+
k8s.io/apiserver v0.34.1
61+
k8s.io/cli-runtime v0.34.1
62+
k8s.io/client-go v0.34.1
63+
k8s.io/component-base v0.34.1
6464
k8s.io/klog/v2 v2.130.1
65-
k8s.io/kubectl v0.33.3
66-
k8s.io/pod-security-admission v0.33.3
67-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
65+
k8s.io/kubectl v0.34.1
66+
k8s.io/pod-security-admission v0.34.1
67+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
6868
sigs.k8s.io/yaml v1.6.0
6969
)
7070

@@ -102,11 +102,11 @@ require (
102102
github.com/docker/docker-credential-helpers v0.8.2 // indirect
103103
github.com/docker/go-connections v0.5.0 // indirect
104104
github.com/docker/go-metrics v0.0.1 // indirect
105-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
105+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
106106
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
107107
github.com/fatih/camelcase v1.0.0 // indirect
108108
github.com/felixge/fgprof v0.9.4 // indirect
109-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
109+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
110110
github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 // indirect
111111
github.com/go-errors/errors v1.4.2 // indirect
112112
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
@@ -133,10 +133,9 @@ require (
133133
github.com/gonum/matrix v0.0.0-20181209220409-c518dec07be9 // indirect
134134
github.com/gonum/stat v0.0.0-20181125101827-41a0da705a5b // indirect
135135
github.com/google/btree v1.1.3 // indirect
136-
github.com/google/gnostic-models v0.6.9 // indirect
136+
github.com/google/gnostic-models v0.7.0 // indirect
137137
github.com/google/go-containerregistry v0.20.0 // indirect
138138
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
139-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
140139
github.com/google/uuid v1.6.0 // indirect
141140
github.com/gorilla/mux v1.8.1 // indirect
142141
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
@@ -145,7 +144,7 @@ require (
145144
github.com/inconshreveable/mousetrap v1.1.0 // indirect
146145
github.com/int128/listener v1.2.0 // indirect
147146
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
148-
github.com/jonboulle/clockwork v0.4.0 // indirect
147+
github.com/jonboulle/clockwork v0.5.0 // indirect
149148
github.com/josharian/intern v1.0.0 // indirect
150149
github.com/json-iterator/go v1.1.12 // indirect
151150
github.com/klauspost/compress v1.18.0 // indirect
@@ -162,60 +161,59 @@ require (
162161
github.com/moby/sys/mountinfo v0.7.2 // indirect
163162
github.com/moby/sys/user v0.4.0 // indirect
164163
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
165-
github.com/modern-go/reflect2 v1.0.2 // indirect
164+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
166165
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
167166
github.com/morikuni/aec v1.0.0 // indirect
168167
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
169168
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
170169
github.com/oklog/ulid v1.3.1 // indirect
171-
github.com/opencontainers/runc v1.1.13 // indirect
172170
github.com/opencontainers/runtime-spec v1.2.1 // indirect
173171
github.com/opencontainers/selinux v1.12.0 // indirect
174172
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
175173
github.com/pkg/errors v0.9.1 // indirect
176174
github.com/pkg/profile v1.7.0 // indirect
177175
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
178176
github.com/proglottis/gpgme v0.1.3 // indirect
179-
github.com/prometheus/client_model v0.6.1 // indirect
180-
github.com/prometheus/common v0.62.0 // indirect
181-
github.com/prometheus/procfs v0.15.1 // indirect
177+
github.com/prometheus/client_model v0.6.2 // indirect
178+
github.com/prometheus/common v0.66.1 // indirect
179+
github.com/prometheus/procfs v0.16.1 // indirect
182180
github.com/robfig/cron v1.2.0 // indirect
183181
github.com/russross/blackfriday/v2 v2.1.0 // indirect
184182
github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
185183
github.com/sigstore/fulcio v1.4.5 // indirect
186184
github.com/sigstore/rekor v1.3.6 // indirect
187185
github.com/sigstore/sigstore v1.8.4 // indirect
188186
github.com/sirupsen/logrus v1.9.3 // indirect
189-
github.com/stretchr/testify v1.10.0 // indirect
187+
github.com/stretchr/testify v1.11.1 // indirect
190188
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
191189
github.com/x448/float16 v0.8.4 // indirect
192190
github.com/xlab/treeprint v1.2.0 // indirect
193191
go.mongodb.org/mongo-driver v1.14.0 // indirect
194-
go.opentelemetry.io/otel v1.33.0 // indirect
195-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
192+
go.opentelemetry.io/otel v1.35.0 // indirect
193+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
196194
go.yaml.in/yaml/v2 v2.4.2 // indirect
197195
go.yaml.in/yaml/v3 v3.0.4 // indirect
198196
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
199-
golang.org/x/text v0.29.0 // indirect
197+
golang.org/x/text v0.30.0 // indirect
200198
golang.org/x/time v0.9.0 // indirect
201-
golang.org/x/tools v0.36.0 // indirect
202-
google.golang.org/protobuf v1.36.5 // indirect
199+
golang.org/x/tools v0.37.0 // indirect
200+
google.golang.org/protobuf v1.36.8 // indirect
203201
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
204202
gopkg.in/inf.v0 v0.9.1 // indirect
205203
gopkg.in/warnings.v0 v0.1.2 // indirect
206204
gopkg.in/yaml.v2 v2.4.0 // indirect
207205
gopkg.in/yaml.v3 v3.0.1 // indirect
208-
k8s.io/component-helpers v0.33.3 // indirect
209-
k8s.io/kube-aggregator v0.33.2 // indirect
210-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
211-
k8s.io/metrics v0.33.3 // indirect
206+
k8s.io/component-helpers v0.34.1 // indirect
207+
k8s.io/kube-aggregator v0.34.1 // indirect
208+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
209+
k8s.io/metrics v0.34.1 // indirect
212210
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
213211
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
214-
sigs.k8s.io/kustomize/api v0.19.0 // indirect
215-
sigs.k8s.io/kustomize/kustomize/v5 v5.6.0 // indirect
216-
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
212+
sigs.k8s.io/kustomize/api v0.20.1 // indirect
213+
sigs.k8s.io/kustomize/kustomize/v5 v5.7.1 // indirect
214+
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
217215
sigs.k8s.io/randfill v1.0.0 // indirect
218-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
216+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
219217
)
220218

221219
replace github.com/apcera/gssapi => github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b

0 commit comments

Comments
 (0)