diff --git a/go.mod b/go.mod index 84fa381a2504..dad60aa1904b 100644 --- a/go.mod +++ b/go.mod @@ -60,20 +60,20 @@ require ( gopkg.in/src-d/go-git.v4 v4.13.1 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.31.8 - k8s.io/apiextensions-apiserver v0.31.8 - k8s.io/apimachinery v0.31.8 - k8s.io/apiserver v0.31.8 - k8s.io/cli-runtime v0.31.8 - k8s.io/client-go v0.31.8 - k8s.io/component-base v0.31.8 - k8s.io/component-helpers v0.31.8 + k8s.io/api v0.31.9 + k8s.io/apiextensions-apiserver v0.31.9 + k8s.io/apimachinery v0.31.9 + k8s.io/apiserver v0.31.9 + k8s.io/cli-runtime v0.31.9 + k8s.io/client-go v0.31.9 + k8s.io/component-base v0.31.9 + k8s.io/component-helpers v0.31.9 k8s.io/klog/v2 v2.130.1 - k8s.io/kube-aggregator v0.31.8 + k8s.io/kube-aggregator v0.31.9 k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 - k8s.io/kubectl v0.31.8 - k8s.io/kubernetes v1.31.8 - k8s.io/pod-security-admission v0.31.8 + k8s.io/kubectl v0.31.9 + k8s.io/kubernetes v1.31.9 + k8s.io/pod-security-admission v0.31.9 k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 sigs.k8s.io/cloud-provider-azure v1.30.4 sigs.k8s.io/kustomize/kyaml v0.17.1 @@ -313,34 +313,34 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44 - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250506053856-af98ede23aa2 - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250506053856-af98ede23aa2 - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250506053856-af98ede23aa2 - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250506053856-af98ede23aa2 - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250506053856-af98ede23aa2 - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250506053856-af98ede23aa2 - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250506053856-af98ede23aa2 - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250506053856-af98ede23aa2 - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250506053856-af98ede23aa2 - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250506053856-af98ede23aa2 - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250506053856-af98ede23aa2 - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250506053856-af98ede23aa2 - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250506053856-af98ede23aa2 - k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250506053856-af98ede23aa2 - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250506053856-af98ede23aa2 - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250506053856-af98ede23aa2 - k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250506053856-af98ede23aa2 - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250506053856-af98ede23aa2 - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250506053856-af98ede23aa2 - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250506053856-af98ede23aa2 - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250506053856-af98ede23aa2 - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250506053856-af98ede23aa2 - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250506053856-af98ede23aa2 - k8s.io/kubernetes => github.com/openshift/kubernetes v1.30.1-0.20250506053856-af98ede23aa2 - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250506053856-af98ede23aa2 - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250506053856-af98ede23aa2 - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250506053856-af98ede23aa2 - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250506053856-af98ede23aa2 - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250506053856-af98ede23aa2 - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250506053856-af98ede23aa2 + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250529021032-af5c163bbf76 + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250529021032-af5c163bbf76 + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250529021032-af5c163bbf76 + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250529021032-af5c163bbf76 + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250529021032-af5c163bbf76 + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250529021032-af5c163bbf76 + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250529021032-af5c163bbf76 + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250529021032-af5c163bbf76 + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250529021032-af5c163bbf76 + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250529021032-af5c163bbf76 + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250529021032-af5c163bbf76 + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250529021032-af5c163bbf76 + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250529021032-af5c163bbf76 + k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250529021032-af5c163bbf76 + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250529021032-af5c163bbf76 + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250529021032-af5c163bbf76 + k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250529021032-af5c163bbf76 + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250529021032-af5c163bbf76 + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250529021032-af5c163bbf76 + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250529021032-af5c163bbf76 + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250529021032-af5c163bbf76 + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250529021032-af5c163bbf76 + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250529021032-af5c163bbf76 + k8s.io/kubernetes => github.com/openshift/kubernetes v1.30.1-0.20250529021032-af5c163bbf76 + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250529021032-af5c163bbf76 + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250529021032-af5c163bbf76 + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250529021032-af5c163bbf76 + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250529021032-af5c163bbf76 + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250529021032-af5c163bbf76 + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250529021032-af5c163bbf76 ) diff --git a/go.sum b/go.sum index 7e612ac4602b..e876c65acffb 100644 --- a/go.sum +++ b/go.sum @@ -680,52 +680,52 @@ github.com/openshift/client-go v0.0.0-20241107164952-923091dd2b1a h1:h3F55x+zOXw github.com/openshift/client-go v0.0.0-20241107164952-923091dd2b1a/go.mod h1:JBIcn1JfD/JCpGYnRRT0+HLxrleF/Y7T3Y/t0p8o5jk= github.com/openshift/cluster-network-operator v0.0.0-20240708200319-1cd8678b38fb h1:Dr0dbSQTAU9UaoAvimGjR+fsvwx2twJ5KR0s/jyAz88= github.com/openshift/cluster-network-operator v0.0.0-20240708200319-1cd8678b38fb/go.mod h1:LnhqxbWhAnhPwilJ4yX1/ly7wCMCYJKkaiSJQSh+Wjg= -github.com/openshift/kubernetes v1.30.1-0.20250506053856-af98ede23aa2 h1:CfqfFHH5bmWbDqYMerThmVE3YOUb087UN/0mQ8CpRiI= -github.com/openshift/kubernetes v1.30.1-0.20250506053856-af98ede23aa2/go.mod h1:2x+thMKQZfKItFccUQDLbzbMOQRT8VJSPZV+nQsw2DM= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250506053856-af98ede23aa2 h1:sctTAMu5oL498LEbB6TZHWGWm6bYcd2SFh7CKlQwkpw= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250506053856-af98ede23aa2/go.mod h1:Lx6jvlmXgJVnqVDARguhONKwlnGahRSWUl57wJltaj8= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250506053856-af98ede23aa2 h1:Bz0fkj/APvlG71i2VU5xxAypkXLNt6UnWz6EwANBrMQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250506053856-af98ede23aa2/go.mod h1:/sTRSdwBpWA0hmURh+C5JWYCIthJyMW1n6aBBT49azk= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250506053856-af98ede23aa2 h1:QrPJD3P8iUqT+TwUmS6MYxyJl3+zA2TCX4wEjnhpy/M= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250506053856-af98ede23aa2/go.mod h1:DESUJPjrTWS0YmETcifsHEKOo08a7J20LkYD8kSuPaI= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250506053856-af98ede23aa2 h1:i0f2pE03QkdGtj8GF0H+PZQxQ44y87vD13g4V7US2LM= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250506053856-af98ede23aa2/go.mod h1:oxz0M5PZdPmrN7fDyAGhd7bn4nfzwPotyyEplTToZDk= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250506053856-af98ede23aa2 h1:+170kGPM3HkjqMz9g+7qOao/OAVOl4fQpJdgoIwAlOo= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250506053856-af98ede23aa2/go.mod h1:7mIF0av5qJ4DSYGbNLBdzbf93wTdmRigWWMm3oroVPY= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250506053856-af98ede23aa2 h1:WOd1DZXB8Teo7Hlj61eK9+03cdyCahnMwMxsEMkzFXc= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250506053856-af98ede23aa2/go.mod h1:KEnQp4pgQ2zdMSYfbCYTs0YasvrxAVx2iekiuoJYjQM= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250506053856-af98ede23aa2 h1:LdGfcTwUAsQKf6wDJRMbl9bLJwwK6UXZrSRnG3Lul94= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250506053856-af98ede23aa2/go.mod h1:quuMw5yefUpYWy/wwj3gVzv1d278qZ955vgdf0KoMaQ= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250506053856-af98ede23aa2 h1:So/pGj/X1JAuchLRsoM5Yp/lAhJY8TeQaBB47pse14Q= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250506053856-af98ede23aa2/go.mod h1:2FS5mTet6db56CX8fh1L3nSiRxhve6Bd6PzfWrKS2wY= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250506053856-af98ede23aa2 h1:K5P2hts62H15aHrqLULqN/LejA7v9KoMrTumtAtAgNg= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250506053856-af98ede23aa2/go.mod h1:tPYN+M62ilI8E7Fsg1zlqpUV6ie/4eTQV6bQ++xZUeU= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250506053856-af98ede23aa2 h1:RljBbvtR7Z1T1vy4NAQP4CiWZeiqZVeJfnAnX9ZiJlQ= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250506053856-af98ede23aa2/go.mod h1:IbbTVcuT16Q2Lj2vpV149HHSifXntLbpPhfS2olk77k= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250506053856-af98ede23aa2 h1:PgyOrq4vVGNkRfYlAxNqQqldjSj7bgQV35RkaJCVD5o= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250506053856-af98ede23aa2/go.mod h1:iFvmLS5dWasxkIgw+BNG/VbuFSUxyQGcGF521EN9B/I= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250506053856-af98ede23aa2 h1:ssbf2zDQFbde4SHicipBxVsOv7HMK8UXvc2z1t2Y1zs= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250506053856-af98ede23aa2/go.mod h1:YpEDCYwaFGuuH5G6cKM2zbgDSvm702C+9Md5rMWNnZU= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250506053856-af98ede23aa2 h1:kM6GqJA4L2ZLNDMyKuxdn+UBe+ymchQ/jym5wjjLT7E= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250506053856-af98ede23aa2/go.mod h1:j3wMbaWkfpRosgrcMI2zpGLdkvkvHBl2hw80Khk8jGc= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250506053856-af98ede23aa2 h1:nK5cOZVplEgEICLcUPNoecX0RkFO2FH0Y5ICZxrbGrY= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250506053856-af98ede23aa2/go.mod h1:CE0eNw5xUf4V+w5ZEuXgGNwwWlzcrV3oeh1oN8A7byM= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250506053856-af98ede23aa2 h1:kmQD3je/0fOrsevm7xAeS+gKLsp/KlkBoG20xMVk5ig= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250506053856-af98ede23aa2/go.mod h1:9EG+cylLe3BInQjd8n7/hBaNIG5joc2kmKoNjiVNUoI= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250506053856-af98ede23aa2 h1:7/Epq0XK7PKsvYVq38n0ucbff79aXemzi/TupZfzaCY= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250506053856-af98ede23aa2/go.mod h1:TT8OLzB/mlUE8ZEJAY/kd4j/Yu6QQN6VWMP305VCbQ0= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250506053856-af98ede23aa2 h1:ahSX5mm81bUA8eILEVS3N6GpTZiTphBgcuQz1TycR2M= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250506053856-af98ede23aa2/go.mod h1:8RBMsB1Vyp8wJe4Hu02I7I6assk7uqz6F1j9ejG5pBw= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250506053856-af98ede23aa2 h1:jAifzCiKgQwLopuM/M+f5mDu4zl5jJXDkGUuv5tMSXw= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250506053856-af98ede23aa2/go.mod h1:ZZoyj+ofRlbElHajU0pqTd6fEinQQW/B+8RQpMJ7PlM= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250506053856-af98ede23aa2 h1:zGyfSZJ2CHir1zL3t3UCa152RORP7H0ewPkHVhFFSs8= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250506053856-af98ede23aa2/go.mod h1:aba+hw0aVr0RPzXhBLxs7UIkV9VyxfpiN7U4zpSUWzM= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250506053856-af98ede23aa2 h1:d0wPViW1JIaBiNVH/MWG2xsdDekBU0KdDWmWp5GeP7o= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250506053856-af98ede23aa2/go.mod h1:+OJMa3w16QOf8hZQu6Cq+pAt5nRnLWjcc1/ZGi+LTCk= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250506053856-af98ede23aa2 h1:1rGyWpFzRQE/PaTr+m1a3dY5ycpEDEEcXMCak1XD6OY= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250506053856-af98ede23aa2/go.mod h1:lYnh13syOSXUO+zZ78dh+6nRbwmNbg8fzzkFxQvdYr4= -github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250506053856-af98ede23aa2 h1:pQ8j6cORBTjhZ6SHk37Ep3v8RKr9picRV+JimO7uciQ= -github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250506053856-af98ede23aa2/go.mod h1:ezZxd9niYysb9GpW8rw5teKvz+PEX779jTR3Z3dEmPg= +github.com/openshift/kubernetes v1.30.1-0.20250529021032-af5c163bbf76 h1:8G+SZm7+O8Vx5CP0Nk2K1gb9T5yUcJNd83rB/oV4uE4= +github.com/openshift/kubernetes v1.30.1-0.20250529021032-af5c163bbf76/go.mod h1:2x+thMKQZfKItFccUQDLbzbMOQRT8VJSPZV+nQsw2DM= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250529021032-af5c163bbf76 h1:0C3VrUOMDUy84sgRRtnB4Dgxz0HaSdvsQu72rH1skFA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250529021032-af5c163bbf76/go.mod h1:Lx6jvlmXgJVnqVDARguhONKwlnGahRSWUl57wJltaj8= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250529021032-af5c163bbf76 h1:DF24Ep/LwNAwzpkQdCKgkbNrPcoaNnnnBOlrNFaOGXE= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250529021032-af5c163bbf76/go.mod h1:/sTRSdwBpWA0hmURh+C5JWYCIthJyMW1n6aBBT49azk= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250529021032-af5c163bbf76 h1:nfTm5b5gELGbZi2V+3r7yXDGPabCwk9rrk5Z0GVRWyc= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250529021032-af5c163bbf76/go.mod h1:DESUJPjrTWS0YmETcifsHEKOo08a7J20LkYD8kSuPaI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250529021032-af5c163bbf76 h1:YnhoXi0fDq7hHQA1KyTUqpv2/h0un+qoeN9pKnCeJUU= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250529021032-af5c163bbf76/go.mod h1:oxz0M5PZdPmrN7fDyAGhd7bn4nfzwPotyyEplTToZDk= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250529021032-af5c163bbf76 h1:ymxoWMUJJoHkifSWxp2ia7Rr5AZTcFFjpZUvtMywxk0= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250529021032-af5c163bbf76/go.mod h1:7mIF0av5qJ4DSYGbNLBdzbf93wTdmRigWWMm3oroVPY= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250529021032-af5c163bbf76 h1:Pxi4nXVqk0WeB2tmFMQug95YL64xws8cg9ia03tlyuU= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250529021032-af5c163bbf76/go.mod h1:KEnQp4pgQ2zdMSYfbCYTs0YasvrxAVx2iekiuoJYjQM= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250529021032-af5c163bbf76 h1:r78M6BBtVrSgjO5VQvcWi5v0Op2UfDFkpaRoIfP5beE= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250529021032-af5c163bbf76/go.mod h1:quuMw5yefUpYWy/wwj3gVzv1d278qZ955vgdf0KoMaQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250529021032-af5c163bbf76 h1:a9dadfHbWCz53dUKeDxPndjFstknRN5pBxl5bgmdVQU= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250529021032-af5c163bbf76/go.mod h1:2FS5mTet6db56CX8fh1L3nSiRxhve6Bd6PzfWrKS2wY= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250529021032-af5c163bbf76 h1:yKVeDwvl6h9AnKB7Yzl4zRym/0ZLxAagBiA3YcgtYPs= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250529021032-af5c163bbf76/go.mod h1:tPYN+M62ilI8E7Fsg1zlqpUV6ie/4eTQV6bQ++xZUeU= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250529021032-af5c163bbf76 h1:KSOYTYegjnLUZRMbDE1IDFTxVQkLIR8ZjyuYCOny2Lc= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250529021032-af5c163bbf76/go.mod h1:IbbTVcuT16Q2Lj2vpV149HHSifXntLbpPhfS2olk77k= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250529021032-af5c163bbf76 h1:dW9JRpStMT6kP4AuBKosKk0TGHKGJOlyvf92WcKCPE4= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250529021032-af5c163bbf76/go.mod h1:iFvmLS5dWasxkIgw+BNG/VbuFSUxyQGcGF521EN9B/I= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250529021032-af5c163bbf76 h1:q3x4Y86TCC1zCPM2a98feuFGLVSKCdp/9MCGsodWBCE= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250529021032-af5c163bbf76/go.mod h1:YpEDCYwaFGuuH5G6cKM2zbgDSvm702C+9Md5rMWNnZU= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250529021032-af5c163bbf76 h1:YCuKG9DDt4TMtdTJ2vr4KNb9VxQ7+bNs3JVxYALEz8Y= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250529021032-af5c163bbf76/go.mod h1:j3wMbaWkfpRosgrcMI2zpGLdkvkvHBl2hw80Khk8jGc= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250529021032-af5c163bbf76 h1:z9hOWQxgp1Hzldly3faA55fatxOxU1yXsMa4Y0qSp9s= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250529021032-af5c163bbf76/go.mod h1:CE0eNw5xUf4V+w5ZEuXgGNwwWlzcrV3oeh1oN8A7byM= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250529021032-af5c163bbf76 h1:99l9eeVRK/+6pMkzQdMjL9IHwS3iW7dwl8St+1u8/G8= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250529021032-af5c163bbf76/go.mod h1:9EG+cylLe3BInQjd8n7/hBaNIG5joc2kmKoNjiVNUoI= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250529021032-af5c163bbf76 h1:jPO9tWF7I+fGdsOl7TqLrRfb6JYFee2nt2TWlriIbYI= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250529021032-af5c163bbf76/go.mod h1:TT8OLzB/mlUE8ZEJAY/kd4j/Yu6QQN6VWMP305VCbQ0= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250529021032-af5c163bbf76 h1:8QhwedPzjZJZQtBOmDAHK0JyJaGS8hEdvRK3dt+Yoic= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250529021032-af5c163bbf76/go.mod h1:8RBMsB1Vyp8wJe4Hu02I7I6assk7uqz6F1j9ejG5pBw= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250529021032-af5c163bbf76 h1:u62u49qd5mrLWf1IhXsV8OCe8plzFsgksZNLMQIHraE= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250529021032-af5c163bbf76/go.mod h1:ZZoyj+ofRlbElHajU0pqTd6fEinQQW/B+8RQpMJ7PlM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250529021032-af5c163bbf76 h1:/XE91MQPI7A5Trw/ytOuT13t1rOf+54WAmcuiilbTkI= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250529021032-af5c163bbf76/go.mod h1:aba+hw0aVr0RPzXhBLxs7UIkV9VyxfpiN7U4zpSUWzM= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250529021032-af5c163bbf76 h1:XsGyC0JFgnlPY7AO+dh9WrtvXmMiAX8BeT684MvCnYM= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250529021032-af5c163bbf76/go.mod h1:+OJMa3w16QOf8hZQu6Cq+pAt5nRnLWjcc1/ZGi+LTCk= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250529021032-af5c163bbf76 h1:EcmjaJv1KuPdjMFM0O2v58+OuLTX0pGLmfex9AvR0B0= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250529021032-af5c163bbf76/go.mod h1:lYnh13syOSXUO+zZ78dh+6nRbwmNbg8fzzkFxQvdYr4= +github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250529021032-af5c163bbf76 h1:6177x9DX6hCDx7w8wnLEqwH24nWkyj4z0phvkyxgW+8= +github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250529021032-af5c163bbf76/go.mod h1:ezZxd9niYysb9GpW8rw5teKvz+PEX779jTR3Z3dEmPg= github.com/openshift/library-go v0.0.0-20250403134058-7c43fdf96c62 h1:SSb9MKF7czLU0O3HZtMoOXuk/FYfau8ILDnzdciGjEo= github.com/openshift/library-go v0.0.0-20250403134058-7c43fdf96c62/go.mod h1:l/3SegTa9x+ry2J213bh7+DBofXOOvdrqU4JC9ktJa0= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44 h1:dKUAGq29JBk2oRn955gnnz3sG/UhlkUKh1ISleLiews= diff --git a/images/tests/Dockerfile.rhel b/images/tests/Dockerfile.rhel index 58bb391e8f60..053645467508 100644 --- a/images/tests/Dockerfile.rhel +++ b/images/tests/Dockerfile.rhel @@ -22,5 +22,5 @@ RUN PACKAGES="git gzip util-linux" && \ LABEL io.k8s.display-name="OpenShift End-to-End Tests" \ io.openshift.release.operator=true \ io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \ - io.openshift.build.versions="kubernetes-tests=1.31.8" \ + io.openshift.build.versions="kubernetes-tests=1.31.9" \ io.openshift.tags="openshift,tests,e2e" diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodevolumelimits/csi.go b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodevolumelimits/csi.go index 9c2e037fd7fc..40da440c2c3c 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodevolumelimits/csi.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodevolumelimits/csi.go @@ -23,6 +23,7 @@ import ( v1 "k8s.io/api/core/v1" storagev1 "k8s.io/api/storage/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/rand" corelisters "k8s.io/client-go/listers/core/v1" @@ -56,6 +57,7 @@ type CSILimits struct { pvLister corelisters.PersistentVolumeLister pvcLister corelisters.PersistentVolumeClaimLister scLister storagelisters.StorageClassLister + vaLister storagelisters.VolumeAttachmentLister randomVolumeIDPrefix string @@ -148,6 +150,7 @@ func (pl *CSILimits) Filter(ctx context.Context, _ *framework.CycleState, pod *v logger.V(5).Info("Could not get a CSINode object for the node", "node", klog.KObj(node), "err", err) } + // Count CSI volumes from the new pod newVolumes := make(map[string]string) if err := pl.filterAttachableVolumes(logger, pod, csiNode, true /* new pod */, newVolumes); err != nil { if apierrors.IsNotFound(err) { @@ -168,6 +171,7 @@ func (pl *CSILimits) Filter(ctx context.Context, _ *framework.CycleState, pod *v return nil } + // Count CSI volumes from existing pods attachedVolumes := make(map[string]string) for _, existingPod := range nodeInfo.Pods { if err := pl.filterAttachableVolumes(logger, existingPod.Pod, csiNode, false /* existing pod */, attachedVolumes); err != nil { @@ -182,6 +186,19 @@ func (pl *CSILimits) Filter(ctx context.Context, _ *framework.CycleState, pod *v attachedVolumeCount[volumeLimitKey]++ } + // Count CSI volumes from VolumeAttachments + volumeAttachments, err := pl.getNodeVolumeAttachmentInfo(logger, node.Name) + if err != nil { + return framework.AsStatus(err) + } + + for volumeUniqueName, driverName := range volumeAttachments { + // Avoid double-counting volumes already used by existing pods + if _, exists := attachedVolumes[volumeUniqueName]; !exists { + attachedVolumeCount[driverName]++ + } + } + newVolumeCount := map[string]int{} for _, volumeLimitKey := range newVolumes { newVolumeCount[volumeLimitKey]++ @@ -264,7 +281,7 @@ func (pl *CSILimits) filterAttachableVolumes( continue } - volumeUniqueName := fmt.Sprintf("%s/%s", driverName, volumeHandle) + volumeUniqueName := getVolumeUniqueName(driverName, volumeHandle) volumeLimitKey := volumeutil.GetCSIAttachLimitKey(driverName) result[volumeUniqueName] = volumeLimitKey } @@ -306,7 +323,7 @@ func (pl *CSILimits) checkAttachableInlineVolume(logger klog.Logger, vol *v1.Vol if translatedPV.Spec.PersistentVolumeSource.CSI == nil { return nil } - volumeUniqueName := fmt.Sprintf("%s/%s", driverName, translatedPV.Spec.PersistentVolumeSource.CSI.VolumeHandle) + volumeUniqueName := getVolumeUniqueName(driverName, translatedPV.Spec.PersistentVolumeSource.CSI.VolumeHandle) volumeLimitKey := volumeutil.GetCSIAttachLimitKey(driverName) result[volumeUniqueName] = volumeLimitKey return nil @@ -416,6 +433,7 @@ func NewCSI(_ context.Context, _ runtime.Object, handle framework.Handle, fts fe pvcLister := informerFactory.Core().V1().PersistentVolumeClaims().Lister() csiNodesLister := informerFactory.Storage().V1().CSINodes().Lister() scLister := informerFactory.Storage().V1().StorageClasses().Lister() + vaLister := informerFactory.Storage().V1().VolumeAttachments().Lister() csiTranslator := csitrans.New() return &CSILimits{ @@ -423,6 +441,7 @@ func NewCSI(_ context.Context, _ runtime.Object, handle framework.Handle, fts fe pvLister: pvLister, pvcLister: pvcLister, scLister: scLister, + vaLister: vaLister, randomVolumeIDPrefix: rand.String(32), translator: csiTranslator, }, nil @@ -443,3 +462,40 @@ func getVolumeLimits(nodeInfo *framework.NodeInfo, csiNode *storagev1.CSINode) m } return nodeVolumeLimits } + +// getNodeVolumeAttachmentInfo returns a map of volumeID to driver name for the given node. +func (pl *CSILimits) getNodeVolumeAttachmentInfo(logger klog.Logger, nodeName string) (map[string]string, error) { + volumeAttachments := make(map[string]string) + vas, err := pl.vaLister.List(labels.Everything()) + if err != nil { + return nil, err + } + for _, va := range vas { + if va.Spec.NodeName == nodeName { + if va.Spec.Attacher == "" { + logger.V(5).Info("VolumeAttachment has no attacher", "VolumeAttachment", klog.KObj(va)) + continue + } + if va.Spec.Source.PersistentVolumeName == nil { + logger.V(5).Info("VolumeAttachment has no PV name", "VolumeAttachment", klog.KObj(va)) + continue + } + pv, err := pl.pvLister.Get(*va.Spec.Source.PersistentVolumeName) + if err != nil { + logger.V(5).Info("Unable to get PV for VolumeAttachment", "VolumeAttachment", klog.KObj(va), "err", err) + continue + } + if pv.Spec.CSI == nil { + logger.V(5).Info("PV is not a CSI volume", "PV", klog.KObj(pv)) + continue + } + volumeID := getVolumeUniqueName(va.Spec.Attacher, pv.Spec.CSI.VolumeHandle) + volumeAttachments[volumeID] = volumeutil.GetCSIAttachLimitKey(va.Spec.Attacher) + } + } + return volumeAttachments, nil +} + +func getVolumeUniqueName(driverName, volumeHandle string) string { + return fmt.Sprintf("%s/%s", driverName, volumeHandle) +} diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/node_expander.go b/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/node_expander.go index f6e52473fb76..2c6b2d4b63aa 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/node_expander.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/node_expander.go @@ -174,7 +174,7 @@ func (ne *NodeExpander) expandOnPlugin() (bool, error, testResponseData) { } // File system resize succeeded, now update the PVC's Capacity to match the PV's - ne.pvc, err = util.MarkFSResizeFinished(ne.pvc, ne.pluginResizeOpts.NewSize, ne.kubeClient) + ne.pvc, err = util.MarkNodeExpansionFinishedWithRecovery(ne.pvc, ne.pluginResizeOpts.NewSize, ne.kubeClient) if err != nil { return true, fmt.Errorf("mountVolume.NodeExpandVolume update pvc status failed: %v", err), testResponseData{true, true} } diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_generator.go b/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_generator.go index b450a8f0ddb1..d4e4d555ce4f 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_generator.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_generator.go @@ -2089,6 +2089,11 @@ func (og *operationGenerator) checkForRecoveryFromExpansion(pvc *v1.PersistentVo featureGateStatus := utilfeature.DefaultFeatureGate.Enabled(features.RecoverVolumeExpansionFailure) if !featureGateStatus { + // even though RecoverVolumeExpansionFailure feature-gate is disabled, we should consider it enabled + // if resizeStatus is not empty or allocatedresources is set + if resizeStatus != "" || allocatedResource != nil { + return true + } return false } diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/resize_util.go b/vendor/k8s.io/kubernetes/pkg/volume/util/resize_util.go index 2bf54b4b85cc..599f220976e7 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/util/resize_util.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/util/resize_util.go @@ -236,6 +236,27 @@ func MarkFSResizeFinished( return updatedPVC, err } +func MarkNodeExpansionFinishedWithRecovery( + pvc *v1.PersistentVolumeClaim, + newSize resource.Quantity, + kubeClient clientset.Interface) (*v1.PersistentVolumeClaim, error) { + newPVC := pvc.DeepCopy() + + newPVC.Status.Capacity[v1.ResourceStorage] = newSize + + allocatedResourceStatusMap := newPVC.Status.AllocatedResourceStatuses + delete(allocatedResourceStatusMap, v1.ResourceStorage) + if len(allocatedResourceStatusMap) == 0 { + newPVC.Status.AllocatedResourceStatuses = nil + } else { + newPVC.Status.AllocatedResourceStatuses = allocatedResourceStatusMap + } + + newPVC = MergeResizeConditionOnPVC(newPVC, []v1.PersistentVolumeClaimCondition{}, false /* keepOldResizeConditions */) + updatedPVC, err := PatchPVCStatus(pvc /*oldPVC*/, newPVC, kubeClient) + return updatedPVC, err +} + // MarkNodeExpansionInfeasible marks a PVC for node expansion as failed. Kubelet should not retry expansion // of volumes which are in failed state. func MarkNodeExpansionInfeasible(pvc *v1.PersistentVolumeClaim, kubeClient clientset.Interface, err error) (*v1.PersistentVolumeClaim, error) { diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go b/vendor/k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go index 4c34d8bc4fd6..9151d180e231 100644 --- a/vendor/k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go +++ b/vendor/k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go @@ -581,6 +581,7 @@ func clusterRoles() []rbacv1.ClusterRole { rbacv1helpers.NewRule("create").Groups(authorizationGroup).Resources("subjectaccessreviews").RuleOrDie(), // Needed for volume limits rbacv1helpers.NewRule(Read...).Groups(storageGroup).Resources("csinodes").RuleOrDie(), + rbacv1helpers.NewRule("get", "list", "watch").Groups(storageGroup).Resources("volumeattachments").RuleOrDie(), // Needed for namespaceSelector feature in pod affinity rbacv1helpers.NewRule(Read...).Groups(legacyGroup).Resources("namespaces").RuleOrDie(), rbacv1helpers.NewRule(Read...).Groups(storageGroup).Resources("csidrivers").RuleOrDie(), diff --git a/vendor/k8s.io/kubernetes/test/e2e/storage/testsuites/multivolume.go b/vendor/k8s.io/kubernetes/test/e2e/storage/testsuites/multivolume.go index 792c29e69ac1..004a3469b3f1 100644 --- a/vendor/k8s.io/kubernetes/test/e2e/storage/testsuites/multivolume.go +++ b/vendor/k8s.io/kubernetes/test/e2e/storage/testsuites/multivolume.go @@ -466,7 +466,14 @@ func (t *multiVolumeTestSuite) DefineTests(driver storageframework.TestDriver, p // Create volume testVolumeSizeRange := t.GetTestSuiteInfo().SupportedSizeRange - resource := storageframework.CreateVolumeResource(ctx, l.driver, l.config, pattern, testVolumeSizeRange) + resource := storageframework.CreateVolumeResourceWithAccessModes( + ctx, + l.driver, + l.config, + pattern, + testVolumeSizeRange, + []v1.PersistentVolumeAccessMode{v1.ReadWriteMany}, + nil /* vacName */) l.resources = append(l.resources, resource) // Test access to the volume from pods on different node diff --git a/vendor/modules.txt b/vendor/modules.txt index 72c8e2c3dee3..2a2e68f9c04b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1816,7 +1816,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.31.8 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/api v0.31.9 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1876,7 +1876,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.31.8 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/apiextensions-apiserver v0.31.9 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1926,7 +1926,7 @@ k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition k8s.io/apiextensions-apiserver/test/integration k8s.io/apiextensions-apiserver/test/integration/fixtures -# k8s.io/apimachinery v0.31.8 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/apimachinery v0.31.9 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/apitesting k8s.io/apimachinery/pkg/api/equality @@ -1998,7 +1998,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.31.8 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/apiserver v0.31.9 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -2175,13 +2175,13 @@ k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics -# k8s.io/cli-runtime v0.31.8 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/cli-runtime v0.31.9 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.31.8 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/client-go v0.31.9 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations k8s.io/client-go/applyconfigurations/admissionregistration/v1 @@ -2537,7 +2537,7 @@ k8s.io/client-go/util/retry k8s.io/client-go/util/testing k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/cloud-provider v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -2556,13 +2556,13 @@ k8s.io/cloud-provider/service/helpers k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/errors k8s.io/cloud-provider/volume/helpers -# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.31.8 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/component-base v0.31.9 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/component-base/cli/flag k8s.io/component-base/cli/globalflag @@ -2593,7 +2593,7 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/version/verflag -# k8s.io/component-helpers v0.31.8 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/component-helpers v0.31.9 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2606,7 +2606,7 @@ k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/ephemeral k8s.io/component-helpers/storage/volume -# k8s.io/controller-manager v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/controller-manager v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/controller-manager/config k8s.io/controller-manager/config/v1 @@ -2618,22 +2618,22 @@ k8s.io/controller-manager/pkg/features k8s.io/controller-manager/pkg/features/register k8s.io/controller-manager/pkg/leadermigration/config k8s.io/controller-manager/pkg/leadermigration/options -# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/cri-client v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/cri-client v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/cri-client/pkg k8s.io/cri-client/pkg/internal k8s.io/cri-client/pkg/logs k8s.io/cri-client/pkg/util -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/dynamic-resource-allocation/cel k8s.io/dynamic-resource-allocation/controller @@ -2660,7 +2660,7 @@ k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.31.8 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/kube-aggregator v0.31.9 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2719,11 +2719,11 @@ k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson k8s.io/kube-openapi/pkg/validation/validate -# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.31.8 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/kubectl v0.31.9 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/util @@ -2748,7 +2748,7 @@ k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubelet v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/kubelet v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2769,7 +2769,7 @@ k8s.io/kubelet/pkg/cri/streaming k8s.io/kubelet/pkg/cri/streaming/portforward k8s.io/kubelet/pkg/cri/streaming/remotecommand k8s.io/kubelet/pkg/types -# k8s.io/kubernetes v1.31.8 => github.com/openshift/kubernetes v1.30.1-0.20250506053856-af98ede23aa2 +# k8s.io/kubernetes v1.31.9 => github.com/openshift/kubernetes v1.30.1-0.20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3586,10 +3586,10 @@ k8s.io/kubernetes/third_party/forked/gonum/graph k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse -# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.31.8 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/pod-security-admission v0.31.9 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3602,7 +3602,7 @@ k8s.io/pod-security-admission/admission/api/validation k8s.io/pod-security-admission/api k8s.io/pod-security-admission/metrics k8s.io/pod-security-admission/policy -# k8s.io/sample-apiserver v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/sample-apiserver v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250529021032-af5c163bbf76 ## explicit; go 1.22.0 k8s.io/sample-apiserver/pkg/apis/wardle k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1 @@ -3846,33 +3846,33 @@ sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 sigs.k8s.io/yaml/goyaml.v3 # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/kubernetes => github.com/openshift/kubernetes v1.30.1-0.20250506053856-af98ede23aa2 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250506053856-af98ede23aa2 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250506053856-af98ede23aa2 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/kubernetes => github.com/openshift/kubernetes v1.30.1-0.20250529021032-af5c163bbf76 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250529021032-af5c163bbf76 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250529021032-af5c163bbf76