Skip to content

Commit 62983a3

Browse files
Merge pull request #2970 from mansikulkarni96/master-submodule-update-05-30
Master submodule update 05 30
2 parents ffb2597 + 718c4d8 commit 62983a3

23 files changed

+354
-196
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ WMCO_VERSION ?= 10.20.0
77

88
# *_GIT_VERSION are the k8s versions. Any update to the build line could potentially require an update to the sed
99
# command in generate_k8s_version_commit() in hack/update_submodules.sh
10-
KUBELET_GIT_VERSION=v1.32.4+f6cfe0c
11-
CONTAINERD_GIT_VERSION=v1.7.26
10+
KUBELET_GIT_VERSION=v1.32.5+886f7c9
11+
CONTAINERD_GIT_VERSION=v1.7.27
1212
# CHANNELS define the bundle channels used in the bundle.
1313
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")
1414
# To re-generate a bundle for other specific channels without changing the standard setup, you can:

containerd

Submodule containerd updated 156 files

go.mod

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ require (
1515
github.com/aws/aws-sdk-go v1.55.7
1616
github.com/coreos/ignition/v2 v2.20.0
1717
github.com/go-imports-organizer/goio v1.5.0
18-
github.com/go-logr/logr v1.4.2
19-
github.com/openshift/api v0.0.0-20250506110418-108fecf747f7
20-
github.com/openshift/client-go v0.0.0-20250425165505-5f55ff6979a1
21-
github.com/openshift/library-go v0.0.0-20250505141135-5184403e7ead
18+
github.com/go-logr/logr v1.4.3
19+
github.com/openshift/api v0.0.0-20250530162003-e041b5efb8e4
20+
github.com/openshift/client-go v0.0.0-20250530142548-32d171ea30dc
21+
github.com/openshift/library-go v0.0.0-20250527100820-96e64a9a7065
2222
github.com/operator-framework/api v0.16.0
2323
github.com/operator-framework/operator-lib v0.4.0
2424
github.com/operator-framework/operator-lifecycle-manager v0.22.0
@@ -33,13 +33,13 @@ require (
3333
golang.org/x/crypto v0.37.0
3434
golang.org/x/mod v0.22.0
3535
golang.org/x/sys v0.32.0
36-
k8s.io/api v0.32.4
37-
k8s.io/apimachinery v0.32.4
38-
k8s.io/client-go v0.32.4
39-
k8s.io/cloud-provider v0.32.4
36+
k8s.io/api v0.32.5
37+
k8s.io/apimachinery v0.32.5
38+
k8s.io/client-go v0.32.5
39+
k8s.io/cloud-provider v0.32.5
4040
k8s.io/klog/v2 v2.130.1
41-
k8s.io/kubectl v0.32.4
42-
k8s.io/kubelet v0.32.4
41+
k8s.io/kubectl v0.32.5
42+
k8s.io/kubelet v0.32.5
4343
k8s.io/kubernetes v1.32.1
4444
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
4545
sigs.k8s.io/controller-runtime v0.20.4
@@ -143,10 +143,10 @@ require (
143143
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
144144
gopkg.in/inf.v0 v0.9.1 // indirect
145145
gopkg.in/yaml.v3 v3.0.1 // indirect
146-
k8s.io/apiextensions-apiserver v0.32.4 // indirect
147-
k8s.io/apiserver v0.32.4 // indirect
148-
k8s.io/cli-runtime v0.32.4 // indirect
149-
k8s.io/component-base v0.32.4 // indirect
146+
k8s.io/apiextensions-apiserver v0.32.5 // indirect
147+
k8s.io/apiserver v0.32.5 // indirect
148+
k8s.io/cli-runtime v0.32.5 // indirect
149+
k8s.io/component-base v0.32.5 // indirect
150150
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
151151
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
152152
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect

go.sum

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7
188188
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
189189
github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
190190
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
191-
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
192-
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
191+
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
192+
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
193193
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
194194
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
195195
github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU=
@@ -493,12 +493,12 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y
493493
github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
494494
github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
495495
github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
496-
github.com/openshift/api v0.0.0-20250506110418-108fecf747f7 h1:TiSwMAxwbyIjMzWI+C/s27lPuD+gD113Pc4rGIg96Mo=
497-
github.com/openshift/api v0.0.0-20250506110418-108fecf747f7/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw=
498-
github.com/openshift/client-go v0.0.0-20250425165505-5f55ff6979a1 h1:2HPG58V07TrrSGBviNPd0PY42vYHPPCIEwj/pb9nUlY=
499-
github.com/openshift/client-go v0.0.0-20250425165505-5f55ff6979a1/go.mod h1:kH5mjMfcHCF0tEnxwvNJTLMnlbrEt3Ua+vMVGvBOK5w=
500-
github.com/openshift/library-go v0.0.0-20250505141135-5184403e7ead h1:ZphMPDBoxhm7/4+5M2gO9h+TTDRcJpQ2Xa5P0Pn2JpA=
501-
github.com/openshift/library-go v0.0.0-20250505141135-5184403e7ead/go.mod h1:DAa3BGl0CFtkfJn/g5rU8kDDTErfMVA/QlFm4cvU+MI=
496+
github.com/openshift/api v0.0.0-20250530162003-e041b5efb8e4 h1:E/NGBIipQbG6+BUuABD+N4bGQawqhLFNx/yX75FwhuY=
497+
github.com/openshift/api v0.0.0-20250530162003-e041b5efb8e4/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw=
498+
github.com/openshift/client-go v0.0.0-20250530142548-32d171ea30dc h1:EQ+F0dpCK1Prfaxy6LliqDjzr7L6QUu0zTraMBnSJHo=
499+
github.com/openshift/client-go v0.0.0-20250530142548-32d171ea30dc/go.mod h1:RHiHbgp5uLpvAU7tGFHaGRFdGxLLDHTiXuFfgdUiyBg=
500+
github.com/openshift/library-go v0.0.0-20250527100820-96e64a9a7065 h1:01KWaWXmdt+oBsN9ppd4vQMf25G5tdEWrtoe02xUhKc=
501+
github.com/openshift/library-go v0.0.0-20250527100820-96e64a9a7065/go.mod h1:DAa3BGl0CFtkfJn/g5rU8kDDTErfMVA/QlFm4cvU+MI=
502502
github.com/operator-framework/api v0.5.2/go.mod h1:L7IvLd/ckxJEJg/t4oTTlnHKAJIP/p51AvEslW3wYdY=
503503
github.com/operator-framework/api v0.16.0 h1:swUOhVv7QDszxBTwYM8QAtyeqI4EQHNVAiKMS+xjakY=
504504
github.com/operator-framework/api v0.16.0/go.mod h1:kk8xJahHJR3bKqrA+A+1VIrhOTmyV76k+ARv+iV+u1Q=
@@ -1069,34 +1069,34 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
10691069
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
10701070
k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
10711071
k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo=
1072-
k8s.io/api v0.32.4 h1:kw8Y/G8E7EpNy7gjB8gJZl3KJkNz8HM2YHrZPtAZsF4=
1073-
k8s.io/api v0.32.4/go.mod h1:5MYFvLvweRhyKylM3Es/6uh/5hGp0dg82vP34KifX4g=
1072+
k8s.io/api v0.32.5 h1:uqjjsYo1kTJr5NIcoIaP9F+TgXgADH7nKQx91FDAhtk=
1073+
k8s.io/api v0.32.5/go.mod h1:bXXFU3fGCZ/eFMZvfHZC69PeGbXEL4zzjuPVzOxHF64=
10741074
k8s.io/apiextensions-apiserver v0.18.2/go.mod h1:q3faSnRGmYimiocj6cHQ1I3WpLqmDgJFlKL37fC4ZvY=
10751075
k8s.io/apiextensions-apiserver v0.20.1/go.mod h1:ntnrZV+6a3dB504qwC5PN/Yg9PBiDNt1EVqbW2kORVk=
1076-
k8s.io/apiextensions-apiserver v0.32.4 h1:IA+CoR63UDOijR/vEpow6wQnX4V6iVpzazJBskHrpHE=
1077-
k8s.io/apiextensions-apiserver v0.32.4/go.mod h1:Y06XO/b92H8ymOdG1HlA1submf7gIhbEDc3RjriqZOs=
1076+
k8s.io/apiextensions-apiserver v0.32.5 h1:o0aKvmzIIs8Uk54pidk32pxET+Pg2ULnh9WI1PuKTwE=
1077+
k8s.io/apiextensions-apiserver v0.32.5/go.mod h1:5fpedJa3HJJFBukAZ6ur91DEDye5gYuXISPbOiNLYpU=
10781078
k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
10791079
k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
1080-
k8s.io/apimachinery v0.32.4 h1:8EEksaxA7nd7xWJkkwLDN4SvWS5ot9g6Z/VZb3ju25I=
1081-
k8s.io/apimachinery v0.32.4/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
1080+
k8s.io/apimachinery v0.32.5 h1:6We3aJ6crC0ap8EhsEXcgX3LpI6SEjubpiOMXLROwPM=
1081+
k8s.io/apimachinery v0.32.5/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
10821082
k8s.io/apiserver v0.18.2/go.mod h1:Xbh066NqrZO8cbsoenCwyDJ1OSi8Ag8I2lezeHxzwzw=
10831083
k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU=
1084-
k8s.io/apiserver v0.32.4 h1:Yf7sd/y+GOQKH1Qf6wUeayZrYXe2SKZ17Bcq7VQM5HQ=
1085-
k8s.io/apiserver v0.32.4/go.mod h1:JFUMNtE2M5yqLZpIsgCb06SkVSW1YcxW1oyLSTfjXR8=
1086-
k8s.io/cli-runtime v0.32.4 h1:5O9eC50+yFFODAan3QXeTJHtoe69ie/A9vWBITIn+KM=
1087-
k8s.io/cli-runtime v0.32.4/go.mod h1:Zn7nvBY625sEEYGtTMMPS619nrmVxabGssHyAKFK7RA=
1084+
k8s.io/apiserver v0.32.5 h1:phmm2EOUVFI+cLiq8Grtuh166fTt/qgvkGPkpgzp5uY=
1085+
k8s.io/apiserver v0.32.5/go.mod h1:5bfueS1tgARVWVXRJBMI5mHoCmev0jOvbxebai/kiqc=
1086+
k8s.io/cli-runtime v0.32.5 h1:cyf6pJLpOFzxT4PbOKIXFyNbQV2IFP53jGADXtrd6tw=
1087+
k8s.io/cli-runtime v0.32.5/go.mod h1:AcqQUyDDFwc4ymBlPpUXVOkyFVjKi9dnDQn3unv1C7E=
10881088
k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU=
10891089
k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y=
1090-
k8s.io/client-go v0.32.4 h1:zaGJS7xoYOYumoWIFXlcVrsiYioRPrXGO7dBfVC5R6M=
1091-
k8s.io/client-go v0.32.4/go.mod h1:k0jftcyYnEtwlFW92xC7MTtFv5BNcZBr+zn9jPlT9Ic=
1092-
k8s.io/cloud-provider v0.32.4 h1:se7sCVBKVpaSV5IJh5ep7BBuxs77982Vl9vVACLteG0=
1093-
k8s.io/cloud-provider v0.32.4/go.mod h1:ht1l2mdgYjvyEwvlWRDZflZyGgomlJE3zJMLlFMHIKA=
1090+
k8s.io/client-go v0.32.5 h1:huFmQMzgWu0z4kbWsuZci+Gt4Fo72I4CcrvhToZ/Qp0=
1091+
k8s.io/client-go v0.32.5/go.mod h1:Qchw6f9WIVrur7DKojAHpRgGLcANT0RLIvF39Jz58xA=
1092+
k8s.io/cloud-provider v0.32.5 h1:KzO0mpXYArWxQH91+a4WLLrhTaO5RGWmQn4lzUXY6ak=
1093+
k8s.io/cloud-provider v0.32.5/go.mod h1:nMd0wwOlOIkl98HgOl960Uf+swbp6FWF/240K3/gkWQ=
10941094
k8s.io/code-generator v0.18.2/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
10951095
k8s.io/code-generator v0.20.1/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=
10961096
k8s.io/component-base v0.18.2/go.mod h1:kqLlMuhJNHQ9lz8Z7V5bxUUtjFZnrypArGl58gmDfUM=
10971097
k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk=
1098-
k8s.io/component-base v0.32.4 h1:HuF+2JVLbFS5GODLIfPCb1Td6b+G2HszJoArcWOSr5I=
1099-
k8s.io/component-base v0.32.4/go.mod h1:10KloJEYw1keU/Xmjfy9TKJqUq7J2mYdiD1VDXoco4o=
1098+
k8s.io/component-base v0.32.5 h1:2HiX+m3s9Iz5CMqdCVDH2V942UqzQvjuhcXb4W+KCsg=
1099+
k8s.io/component-base v0.32.5/go.mod h1:jDsPNFFElv9m27TcYxlpEX7TZ3vdgx2g4PaqMUHpV/Y=
11001100
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
11011101
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
11021102
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
@@ -1113,10 +1113,10 @@ k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C
11131113
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
11141114
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
11151115
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
1116-
k8s.io/kubectl v0.32.4 h1:PhiS4JgnJE6/JcksIJHAQI41F4hwJ270UopbcDsutF0=
1117-
k8s.io/kubectl v0.32.4/go.mod h1:XYFDrC1l3cpjWRj7UfS0LDAMlK+6eTema28NeUYFKD8=
1118-
k8s.io/kubelet v0.32.4 h1:aYjgRQYIsogtBFu+9BzJGKCT5iw8b7vg5BNkV39H+5c=
1119-
k8s.io/kubelet v0.32.4/go.mod h1:IHKF2BECx8V36b0T/IFg6Y1omKaFgbcUHoSMnIvA2iE=
1116+
k8s.io/kubectl v0.32.5 h1:LUHZhYkIu9Cji6x1V7s4uyCGxJlS461VSYj2GyuQJtM=
1117+
k8s.io/kubectl v0.32.5/go.mod h1:YA7mZP44lVEn9qXRinM9THMNvVWJ6edwyHZSVMTVQbo=
1118+
k8s.io/kubelet v0.32.5 h1:PkD/XAO3KArZIi/B+cHEUBd6VfjHxHK/KYaThEQ3n8E=
1119+
k8s.io/kubelet v0.32.5/go.mod h1:5DlJlmv/PDspCFcMUQ+r5muJtg/jgxFr6Kqd28WXfIA=
11201120
k8s.io/kubernetes v1.32.1 h1:46YPpIBCT9dkmeglstZ2Gg4LGaAdro1/3IQ+1AfbF1s=
11211121
k8s.io/kubernetes v1.32.1/go.mod h1:tiIKO63GcdPRBHW2WiUFm3C0eoLczl3f7qi56Dm1W8I=
11221122
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=

kubelet

Submodule kubelet updated 34 files

ovn-kubernetes

Submodule ovn-kubernetes updated 211 files

vendor/github.com/go-logr/logr/.golangci.yaml

Lines changed: 9 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-logr/logr/funcr/funcr.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)