Skip to content

Commit 31dd892

Browse files
Merge pull request #30230 from bertinatto/bump-1.31.12-ocp-4.18
OCPBUGS-60511: Bump to latest openshift/kubernetes (v1.31.12)
2 parents 051eac5 + 34bec73 commit 31dd892

File tree

17 files changed

+344
-181
lines changed

17 files changed

+344
-181
lines changed

go.mod

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,21 @@ require (
6060
gopkg.in/src-d/go-git.v4 v4.13.1
6161
gopkg.in/yaml.v2 v2.4.0
6262
gopkg.in/yaml.v3 v3.0.1
63-
k8s.io/api v0.31.10
64-
k8s.io/apiextensions-apiserver v0.31.10
65-
k8s.io/apimachinery v0.31.10
66-
k8s.io/apiserver v0.31.10
67-
k8s.io/cli-runtime v0.31.10
68-
k8s.io/client-go v0.31.10
69-
k8s.io/component-base v0.31.10
70-
k8s.io/component-helpers v0.31.10
63+
k8s.io/api v0.31.12
64+
k8s.io/apiextensions-apiserver v0.31.12
65+
k8s.io/apimachinery v0.31.12
66+
k8s.io/apiserver v0.31.12
67+
k8s.io/cli-runtime v0.31.12
68+
k8s.io/client-go v0.31.12
69+
k8s.io/component-base v0.31.12
70+
k8s.io/component-helpers v0.31.12
7171
k8s.io/klog/v2 v2.130.1
72-
k8s.io/kube-aggregator v0.31.10
72+
k8s.io/kube-aggregator v0.31.12
7373
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940
74-
k8s.io/kubectl v0.31.10
75-
k8s.io/kubernetes v1.31.10
76-
k8s.io/pod-security-admission v0.31.10
77-
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
74+
k8s.io/kubectl v0.31.12
75+
k8s.io/kubernetes v1.31.12
76+
k8s.io/pod-security-admission v0.31.12
77+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
7878
sigs.k8s.io/cloud-provider-azure v1.30.4
7979
sigs.k8s.io/kustomize/kyaml v0.17.1
8080
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
@@ -313,34 +313,34 @@ require (
313313

314314
replace (
315315
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44
316-
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250705105911-817e6dd5e0cb
317-
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250705105911-817e6dd5e0cb
318-
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250705105911-817e6dd5e0cb
319-
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250705105911-817e6dd5e0cb
320-
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250705105911-817e6dd5e0cb
321-
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250705105911-817e6dd5e0cb
322-
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250705105911-817e6dd5e0cb
323-
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250705105911-817e6dd5e0cb
324-
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250705105911-817e6dd5e0cb
325-
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250705105911-817e6dd5e0cb
326-
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250705105911-817e6dd5e0cb
327-
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250705105911-817e6dd5e0cb
328-
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250705105911-817e6dd5e0cb
329-
k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250705105911-817e6dd5e0cb
330-
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250705105911-817e6dd5e0cb
331-
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250705105911-817e6dd5e0cb
332-
k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250705105911-817e6dd5e0cb
333-
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250705105911-817e6dd5e0cb
334-
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250705105911-817e6dd5e0cb
335-
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250705105911-817e6dd5e0cb
336-
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250705105911-817e6dd5e0cb
337-
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250705105911-817e6dd5e0cb
338-
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250705105911-817e6dd5e0cb
339-
k8s.io/kubernetes => github.com/openshift/kubernetes v1.30.1-0.20250705105911-817e6dd5e0cb
340-
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250705105911-817e6dd5e0cb
341-
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250705105911-817e6dd5e0cb
342-
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250705105911-817e6dd5e0cb
343-
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250705105911-817e6dd5e0cb
344-
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250705105911-817e6dd5e0cb
345-
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250705105911-817e6dd5e0cb
316+
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250907190718-a4cad449903e
317+
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250907190718-a4cad449903e
318+
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250907190718-a4cad449903e
319+
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250907190718-a4cad449903e
320+
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250907190718-a4cad449903e
321+
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250907190718-a4cad449903e
322+
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250907190718-a4cad449903e
323+
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250907190718-a4cad449903e
324+
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250907190718-a4cad449903e
325+
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250907190718-a4cad449903e
326+
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250907190718-a4cad449903e
327+
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250907190718-a4cad449903e
328+
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250907190718-a4cad449903e
329+
k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250907190718-a4cad449903e
330+
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250907190718-a4cad449903e
331+
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250907190718-a4cad449903e
332+
k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250907190718-a4cad449903e
333+
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250907190718-a4cad449903e
334+
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250907190718-a4cad449903e
335+
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250907190718-a4cad449903e
336+
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250907190718-a4cad449903e
337+
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250907190718-a4cad449903e
338+
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250907190718-a4cad449903e
339+
k8s.io/kubernetes => github.com/openshift/kubernetes v1.30.1-0.20250907190718-a4cad449903e
340+
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250907190718-a4cad449903e
341+
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250907190718-a4cad449903e
342+
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250907190718-a4cad449903e
343+
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250907190718-a4cad449903e
344+
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250907190718-a4cad449903e
345+
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250907190718-a4cad449903e
346346
)

0 commit comments

Comments
 (0)