diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var
index 6fdc059c3e..799f401a46 100644
--- a/Makefile.kube_git.var
+++ b/Makefile.kube_git.var
@@ -1,5 +1,5 @@
 KUBE_GIT_MAJOR=1
 KUBE_GIT_MINOR=28
 KUBE_GIT_VERSION=v1.28.9
-KUBE_GIT_COMMIT=8ca71f701a70cb3eed8603478e5f6c1676319fc4
+KUBE_GIT_COMMIT=416ecaf479d8fa342937068dede6481f5c7a1441
 KUBE_GIT_TREE_STATE=clean
diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var
index 3a68bd87e4..b6ec26c905 100644
--- a/Makefile.version.aarch64.var
+++ b/Makefile.version.aarch64.var
@@ -1 +1 @@
-OCP_VERSION := 4.15.0-0.nightly-arm64-2024-05-13-200905
+OCP_VERSION := 4.15.0-0.nightly-arm64-2024-05-14-190638
diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var
index 6e4ea0f205..9bb2d294e3 100644
--- a/Makefile.version.x86_64.var
+++ b/Makefile.version.x86_64.var
@@ -1 +1 @@
-OCP_VERSION := 4.15.0-0.nightly-2024-05-08-194059
+OCP_VERSION := 4.15.0-0.nightly-2024-05-14-175553
diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
index 7c0ec2ee22..f4042aa801 100644
--- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
+++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
@@ -8,7 +8,7 @@ images:
     digest: sha256:957e818a3f6d603dc285175359ebf308d0345584130fbd47d181755d05818e63
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:79ab35b2189cca6958fcbad3b060cdd6cadec72ea0284e91b13b53505494f116
+    digest: sha256:7e370d7b0b7cec17cc5438791c79a8d746e0124327f9e4734b9706bab2bbb0f0
 
 patches:
   - patch: |-
diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
index 221d31b1bb..ef628e0278 100644
--- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
+++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.15.0-0.nightly-arm64-2024-05-13-200905"
+    "base": "4.15.0-0.nightly-arm64-2024-05-14-190638"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3128b3e2be65ff533865c00f1c44c2c4f6d31cf7d714cf94591d5d659b2552d3",
diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
index 17c1f5ec53..40e7a0bb3d 100644
--- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
+++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.15.0-0.nightly-2024-05-08-194059"
+    "base": "4.15.0-0.nightly-2024-05-14-175553"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4b49b6a46a19d811eb6c8546110dc574bb302238aa9ad6082041e3195858ef3",
     "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:957e818a3f6d603dc285175359ebf308d0345584130fbd47d181755d05818e63",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79ab35b2189cca6958fcbad3b060cdd6cadec72ea0284e91b13b53505494f116"
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e370d7b0b7cec17cc5438791c79a8d746e0124327f9e4734b9706bab2bbb0f0"
   }
 }
diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json
index 7091fd33f8..2413450709 100644
--- a/assets/release/release-aarch64.json
+++ b/assets/release/release-aarch64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.15.0-0.nightly-arm64-2024-05-13-200905"
+    "base": "4.15.0-0.nightly-arm64-2024-05-14-190638"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4952c164a4d1d4a3221d31cc76f7af0288928f65d8b700e5be8ec8ff42001991",
diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json
index 205e3ac803..9bec26590e 100644
--- a/assets/release/release-x86_64.json
+++ b/assets/release/release-x86_64.json
@@ -1,15 +1,15 @@
 {
   "release": {
-    "base": "4.15.0-0.nightly-2024-05-08-194059"
+    "base": "4.15.0-0.nightly-2024-05-14-175553"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:74689a85fae8ab9992c7f94511e4dac75139b8d62ac995fe92f68db5906bb4dd",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:336b76cc69858575dfab926fac3d8963b353c745e3e7fc3f7c4a610b81bbdc10",
     "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f983145416621deeb8713ffd6559621b074a7153b6158a23b1b316fa3cfb5717",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c681b784f8452758bca16cc9c7454f4d5196b3657f104d1e57912fbbf70066cd",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79ab35b2189cca6958fcbad3b060cdd6cadec72ea0284e91b13b53505494f116",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f22b9c2b68743c61eebb643980ba46b98d469512a29de76021793ebeb3e82c7",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e370d7b0b7cec17cc5438791c79a8d746e0124327f9e4734b9706bab2bbb0f0",
     "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a0a5583c18bf17534f8232c84e36851d1b18c3707a6fede75877a29ceaac24a2",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9280df3d25f773251f1179fe9defd8bba30413b86e978920ec3231f65843b0d8",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09fd56c82f34179ed7bd802485fd32d56b682115bfc19019ba6a4f7ecb489f79",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91007cd2d585f070bd46eea76e09034149fa1796a4c204abc6c320df60d790ba",
     "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:902e1022029ccb59689e66510cb0d926947ae4ce1a33c68b8dee4270e59789d6",
     "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
     "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470",
diff --git a/etcd/go.mod b/etcd/go.mod
index ff2d4e0d5e..b4fa289ddb 100644
--- a/etcd/go.mod
+++ b/etcd/go.mod
@@ -145,35 +145,35 @@ replace (
 	go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240424135504-a7005ef1eae8 // from etcd
 	go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240424135504-a7005ef1eae8 // from etcd
 	go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240424135504-a7005ef1eae8 // from etcd
-	k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
+	k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
 )
 
-replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
+replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
diff --git a/etcd/go.sum b/etcd/go.sum
index 4a437b2d21..76e807f3f8 100644
--- a/etcd/go.sum
+++ b/etcd/go.sum
@@ -186,18 +186,18 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20240424135504-a7005ef1eae8 h1:cHzYVq
 github.com/openshift/etcd/raft/v3 v3.5.1-0.20240424135504-a7005ef1eae8/go.mod h1:ERQuZVe79PI6vcC3DlKBukDCLja/L7YMu29B74Iwj4U=
 github.com/openshift/etcd/server/v3 v3.5.1-0.20240424135504-a7005ef1eae8 h1:odYEwXTw9Xh+9/jqCPRiS1SMtttO/xJDywbf1rRMe9U=
 github.com/openshift/etcd/server/v3 v3.5.1-0.20240424135504-a7005ef1eae8/go.mod h1:axB0oCjMy+cemo5290/CutIjoxlfA6KVYKD1w0uue10=
-github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240502205528-8ca71f701a70 h1:aSzIFJ6oYxl9ZsqT1S9rHh3Q1Xx0cOJex8cXnqr8f5g=
-github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240502205528-8ca71f701a70/go.mod h1:O9dOFHEhPB2cBNgLfgJWxr7PQsKaZD+s4ge7yinLRK8=
-github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240502205528-8ca71f701a70 h1:R7Dc6tei9p7w6AKAhoefclnpAJbYOjNxIG+2YcWhfss=
-github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240502205528-8ca71f701a70/go.mod h1:7BnMj1Uk0Crj/ZzEX8nutXD+pDC9PV6dlK2Nk65O4oE=
-github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240502205528-8ca71f701a70 h1:5sZQO8PkU8wmIQ6CuSaurl0FfjJISk/v7nVE08TsH5U=
-github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240502205528-8ca71f701a70/go.mod h1:hcVqKPtkg/49SbED/gEqOsCga5ErLmvpQsLB5Ecnz9k=
-github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240502205528-8ca71f701a70 h1:qFPdqp6gpyaHPHsA42Tdm8fc75/c9V9sVFxyf+CK/3A=
-github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240502205528-8ca71f701a70/go.mod h1:rKnUyK/VWH8h8Usz90I49JOrSZLP55QhhXo/XuiGG5g=
-github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240502205528-8ca71f701a70 h1:JT4MfRtPtRo0vOMraH7CAQyrBqAJsKwkD0ErzDKnlrw=
-github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240502205528-8ca71f701a70/go.mod h1:PYRe3SAiqU7/Z5r9bQm1bmOqGk+bYRcx9QcVOMJGFgk=
-github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240502205528-8ca71f701a70 h1:RX9TyX89oL6UiaZdyZFRZK5uhqAymTCnk5PUzfPfPp4=
-github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240502205528-8ca71f701a70/go.mod h1:tjy5O1L/8+AVf1sJ4QNuQSy6yUxB+8XKp/57p4s3oXU=
+github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240508141308-416ecaf479d8 h1:SdJXNc+b1eu98YhwN/12Aromqu0MzxArqf8wI2a24BY=
+github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240508141308-416ecaf479d8/go.mod h1:O9dOFHEhPB2cBNgLfgJWxr7PQsKaZD+s4ge7yinLRK8=
+github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240508141308-416ecaf479d8 h1:dUM01EySJVSUflEKqH9PF6aAODALBRdMtm7yx6boqZo=
+github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240508141308-416ecaf479d8/go.mod h1:7BnMj1Uk0Crj/ZzEX8nutXD+pDC9PV6dlK2Nk65O4oE=
+github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240508141308-416ecaf479d8 h1:a4oLYmbgvP8di+/IOYXnDa3Ky7LcEaPBmFkZGAERRCw=
+github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240508141308-416ecaf479d8/go.mod h1:hcVqKPtkg/49SbED/gEqOsCga5ErLmvpQsLB5Ecnz9k=
+github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240508141308-416ecaf479d8 h1:H2SWIyV+y3IasGUCG1/wy/7GQ8RLO6kRTZCYnRtxNm0=
+github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240508141308-416ecaf479d8/go.mod h1:rKnUyK/VWH8h8Usz90I49JOrSZLP55QhhXo/XuiGG5g=
+github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240508141308-416ecaf479d8 h1:/X+QAKq/q2HEmVdsW9QfGryrrJiJB8qxB4G4gG2kKOI=
+github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240508141308-416ecaf479d8/go.mod h1:PYRe3SAiqU7/Z5r9bQm1bmOqGk+bYRcx9QcVOMJGFgk=
+github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240508141308-416ecaf479d8 h1:GU2c+lm4bAwzONDR8IkAXvwMCO1d1kPRsXJ0kAoD6Ho=
+github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240508141308-416ecaf479d8/go.mod h1:tjy5O1L/8+AVf1sJ4QNuQSy6yUxB+8XKp/57p4s3oXU=
 github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e h1:WgaylNSIB4uff7ieewaqIiEG3mP6jSMER8LCkoOEkys=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt
index cde06c3165..6a271cb294 100644
--- a/etcd/vendor/modules.txt
+++ b/etcd/vendor/modules.txt
@@ -598,7 +598,7 @@ gopkg.in/yaml.v2
 # gopkg.in/yaml.v3 v3.0.1
 ## explicit
 gopkg.in/yaml.v3
-# k8s.io/api v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/api v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/api/admission/v1
 k8s.io/api/admission/v1beta1
@@ -655,7 +655,7 @@ k8s.io/api/scheduling/v1beta1
 k8s.io/api/storage/v1
 k8s.io/api/storage/v1alpha1
 k8s.io/api/storage/v1beta1
-# k8s.io/apimachinery v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/apimachinery v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/apimachinery/pkg/api/equality
 k8s.io/apimachinery/pkg/api/errors
@@ -708,13 +708,13 @@ 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/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/client-go v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/client-go/applyconfigurations/admissionregistration/v1
 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1
@@ -860,7 +860,7 @@ k8s.io/client-go/util/homedir
 k8s.io/client-go/util/jsonpath
 k8s.io/client-go/util/keyutil
 k8s.io/client-go/util/workqueue
-# k8s.io/component-base v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/component-base v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/component-base/cli
 k8s.io/component-base/cli/flag
@@ -897,7 +897,7 @@ k8s.io/kube-openapi/pkg/spec3
 k8s.io/kube-openapi/pkg/util/proto
 k8s.io/kube-openapi/pkg/util/proto/validation
 k8s.io/kube-openapi/pkg/validation/spec
-# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/kubectl/pkg/cmd/util
 k8s.io/kubectl/pkg/scheme
@@ -1025,33 +1025,33 @@ sigs.k8s.io/yaml
 # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240424135504-a7005ef1eae8
 # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240424135504-a7005ef1eae8
 # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240424135504-a7005ef1eae8
-# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240508141308-416ecaf479d8
diff --git a/go.mod b/go.mod
index a349e26ed6..ed769db1d1 100644
--- a/go.mod
+++ b/go.mod
@@ -237,36 +237,36 @@ require (
 
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e // from kubernetes
-	k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
-	k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240502205528-8ca71f701a70 // release kubernetes
-	k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
-	k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240502205528-8ca71f701a70 // from kubernetes
+	k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
+	k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240508141308-416ecaf479d8 // release kubernetes
+	k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
+	k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240508141308-416ecaf479d8 // from kubernetes
 )
 
 replace (
@@ -277,4 +277,4 @@ replace (
 
 replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8 // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator
 
-replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240502205528-8ca71f701a70 // staging kubernetes
+replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240508141308-416ecaf479d8 // staging kubernetes
diff --git a/go.sum b/go.sum
index 4b4f3d7b9e..44098a3615 100644
--- a/go.sum
+++ b/go.sum
@@ -531,60 +531,60 @@ github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240424135504-a7005ef1eae8 h1:
 github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240424135504-a7005ef1eae8/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4=
 github.com/openshift/etcd/client/v3 v3.5.1-0.20240424135504-a7005ef1eae8 h1:w/Et0E3LO3/e0MLw7sPUfVzAQYHD6/XesVGyn3xE6NY=
 github.com/openshift/etcd/client/v3 v3.5.1-0.20240424135504-a7005ef1eae8/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw=
-github.com/openshift/kubernetes v0.0.0-20240502205528-8ca71f701a70 h1:ZJWghoC5nYoSHfVexA1AtTUw1tP0aNV92posuzXun94=
-github.com/openshift/kubernetes v0.0.0-20240502205528-8ca71f701a70/go.mod h1:bsnNELIfLpXgP7zJ3NdWjYhuGs+p8ytZTox5BffcWZQ=
+github.com/openshift/kubernetes v0.0.0-20240508141308-416ecaf479d8 h1:tebEB9IKYfbH0fYZw6Dj/Qz42iCXD2Td1MxQ7e699eY=
+github.com/openshift/kubernetes v0.0.0-20240508141308-416ecaf479d8/go.mod h1:bsnNELIfLpXgP7zJ3NdWjYhuGs+p8ytZTox5BffcWZQ=
 github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8 h1:dFt4v5LeBJ4Ohf9oaZ5tce37PPGAeZ4sdbDIeW3R2qo=
 github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8/go.mod h1:nc9vh1Bd8i4OnTM+uoZeFbRaJJ9uOs1AzaN69SdVnd8=
-github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240502205528-8ca71f701a70 h1:aSzIFJ6oYxl9ZsqT1S9rHh3Q1Xx0cOJex8cXnqr8f5g=
-github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240502205528-8ca71f701a70/go.mod h1:O9dOFHEhPB2cBNgLfgJWxr7PQsKaZD+s4ge7yinLRK8=
-github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240502205528-8ca71f701a70 h1:4g+8rKu1H5V8sfOQDfuJyI3RjUOelvWSySYk+82hggU=
-github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240502205528-8ca71f701a70/go.mod h1:JEADgAmrcdlYUwWYmH2+4folhuDunQF6kM8XkyjlSes=
-github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240502205528-8ca71f701a70 h1:R7Dc6tei9p7w6AKAhoefclnpAJbYOjNxIG+2YcWhfss=
-github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240502205528-8ca71f701a70/go.mod h1:7BnMj1Uk0Crj/ZzEX8nutXD+pDC9PV6dlK2Nk65O4oE=
-github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240502205528-8ca71f701a70 h1:LOmtEwX3/ghqx4ZJ8lr9iP75z05LavvIsdF4Me4mUgM=
-github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240502205528-8ca71f701a70/go.mod h1:Hpg+2FKUQKOUWwYlku3FZzWY6HuFxsZYaF7gSY/AWcY=
-github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240502205528-8ca71f701a70 h1:5sZQO8PkU8wmIQ6CuSaurl0FfjJISk/v7nVE08TsH5U=
-github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240502205528-8ca71f701a70/go.mod h1:hcVqKPtkg/49SbED/gEqOsCga5ErLmvpQsLB5Ecnz9k=
-github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240502205528-8ca71f701a70 h1:qFPdqp6gpyaHPHsA42Tdm8fc75/c9V9sVFxyf+CK/3A=
-github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240502205528-8ca71f701a70/go.mod h1:rKnUyK/VWH8h8Usz90I49JOrSZLP55QhhXo/XuiGG5g=
-github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240502205528-8ca71f701a70 h1:3bJqzHHJWLQgi/xMLHeMkaGexHb1iKBtKQ62vFFNuJI=
-github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240502205528-8ca71f701a70/go.mod h1:lVv1CgyClHwgW5VnkxtnlYMZ093FHDjOWZ2wWrPFwd4=
-github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240502205528-8ca71f701a70 h1:AGfw7cbuVejhuyCp07OY/+Ocb3sZrESTppblCca+Nyw=
-github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240502205528-8ca71f701a70/go.mod h1:3KcUMZbIfc2yAtIqUVDV2B/ga6f20OJVcpNEvsYp3Ao=
-github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240502205528-8ca71f701a70 h1:JT4MfRtPtRo0vOMraH7CAQyrBqAJsKwkD0ErzDKnlrw=
-github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240502205528-8ca71f701a70/go.mod h1:PYRe3SAiqU7/Z5r9bQm1bmOqGk+bYRcx9QcVOMJGFgk=
-github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240502205528-8ca71f701a70 h1:bBPcnf0SCnyZqnB314SITsO4gXo+Q5BEWzY+tV8wcwc=
-github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240502205528-8ca71f701a70/go.mod h1:WK3e7yoVDEdU2wygztXJq4oap6OmUEWgXs/+EeK0N6U=
-github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240502205528-8ca71f701a70 h1:8EPC58bAgr0rorYvLBZGTZi8udMBZkmfn/giJnvVFo8=
-github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240502205528-8ca71f701a70/go.mod h1:5mPuadzKxGVO2k9j/c23Q6misGE7wxYniJdBQ8tE+S4=
-github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240502205528-8ca71f701a70 h1:lM/Dolhi3OcogiKflyzFU9K7T3cm9wn8yF67cSl4klY=
-github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240502205528-8ca71f701a70/go.mod h1:HMmv7N9wOjHZrbf1YqRgMErFEpTqFOcIiut+GURNUDY=
-github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240502205528-8ca71f701a70 h1:3zEV+jH8jbgLOlqKq0HCKh8NxFUEytIa1POQPO3HfZ4=
-github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240502205528-8ca71f701a70/go.mod h1:XGUW1T75Y4roafsC0O5ixBRF4Yqh72F6ofJidfyd7ug=
-github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240502205528-8ca71f701a70 h1:sye+2UK9Edxzfc1lOtcYG0J6FatvY/lLKLk7tfrA6yE=
-github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240502205528-8ca71f701a70/go.mod h1:W5+zUyc/kGg5H+dblnCDE8NvbipxORM5w10YbT6+SiM=
-github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240502205528-8ca71f701a70 h1:vyicVXDXBA78XIgnPtIjU7EcCczVTopKI7rmnwvAMHE=
-github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240502205528-8ca71f701a70/go.mod h1:ohENrW+TZNnuno7gvqHlzFzrI3zm6rOIoq0bAbYtn1o=
-github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240502205528-8ca71f701a70 h1:ncJ2//STh/tQgOJK6E5tMvc44KclJCn8053SJ6+TBLc=
-github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240502205528-8ca71f701a70/go.mod h1:1o9ZKC10P81K3Hbq87MokusYZmOUIhBtVZpWM77lrGs=
-github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240502205528-8ca71f701a70 h1:+jzJH4v1oKkNNjvw1MdfgZqZbJGBgbHRkYjgSfRHMpM=
-github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240502205528-8ca71f701a70/go.mod h1:fMgmy+6VTrNP/xhEj66IlGfRZLZU0r2c1hYS3U/uLfE=
-github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240502205528-8ca71f701a70 h1:MYVRCCAIyu3tXKwSA0b0bukzr2hSf4NXn5Dgibkw6/Q=
-github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240502205528-8ca71f701a70/go.mod h1:EX7y9N2qRhJAneA2tQkdpT3a00BrQ7D4GfWUoM1kiEc=
-github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240502205528-8ca71f701a70 h1:MATETFQvInHTleH4zQl8lhz0FTnSjIMX16Wam0hYbK4=
-github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240502205528-8ca71f701a70/go.mod h1:A6RR84Xj6s1lgkxYAD/pU6u/4umbP5RQ64vM0P1kGig=
-github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240502205528-8ca71f701a70 h1:RX9TyX89oL6UiaZdyZFRZK5uhqAymTCnk5PUzfPfPp4=
-github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240502205528-8ca71f701a70/go.mod h1:tjy5O1L/8+AVf1sJ4QNuQSy6yUxB+8XKp/57p4s3oXU=
-github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240502205528-8ca71f701a70 h1:H6jw/+ZZxk6KNMtmoGYXWQteqt06iW8ePZ5AhBg7m/U=
-github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240502205528-8ca71f701a70/go.mod h1:FQy6hmOWj0VRRbVgtj8NqBuAlNsl9ioRTWSBWnYMNf0=
-github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240502205528-8ca71f701a70 h1:LjTH4tSs/CEz1UxFHH9f9DgSYpKNf37JZIPBOXgp658=
-github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240502205528-8ca71f701a70/go.mod h1:NgGcteIwIAy0r/PqqWnL3Jv78EKxdsw6LYgW6vhvBwY=
-github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240502205528-8ca71f701a70 h1:7rRWc3/OZZFhrk8KOFiCXeWFN8xGqBvycXV2Hs4ZpU8=
-github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240502205528-8ca71f701a70/go.mod h1:T1rrpTODDkDjEqupzhkEFdV1cy7MIiYvJq6inj2r0DA=
-github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240502205528-8ca71f701a70 h1:CfgdYI4KQU0cirseu1YnDTIQpfwClh19KeqbsJNq+GY=
-github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240502205528-8ca71f701a70/go.mod h1:aqPYdSTRGLeQ5zysObqnK3oQ0suNhDJ3DflZKfPjPFc=
-github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240502205528-8ca71f701a70 h1:/4RaQ9ZMgGOiexdRt70rAVa295qT1QyxVmAvMMa2T0c=
-github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240502205528-8ca71f701a70/go.mod h1:nUYBUMVG4iQ6Z8Zywo64kbAxFJorSvZ5dthvNTZYTwY=
+github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240508141308-416ecaf479d8 h1:SdJXNc+b1eu98YhwN/12Aromqu0MzxArqf8wI2a24BY=
+github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240508141308-416ecaf479d8/go.mod h1:O9dOFHEhPB2cBNgLfgJWxr7PQsKaZD+s4ge7yinLRK8=
+github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240508141308-416ecaf479d8 h1:DVqu8w9tY8Idehk2pDa4OAYaxTNmvOfF1Htmk81Z2S4=
+github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240508141308-416ecaf479d8/go.mod h1:JEADgAmrcdlYUwWYmH2+4folhuDunQF6kM8XkyjlSes=
+github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240508141308-416ecaf479d8 h1:dUM01EySJVSUflEKqH9PF6aAODALBRdMtm7yx6boqZo=
+github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240508141308-416ecaf479d8/go.mod h1:7BnMj1Uk0Crj/ZzEX8nutXD+pDC9PV6dlK2Nk65O4oE=
+github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240508141308-416ecaf479d8 h1:3n1hEreFddqokCJ0LBwxx6v1cdT5C2JGKnGe8jZNPDg=
+github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240508141308-416ecaf479d8/go.mod h1:Hpg+2FKUQKOUWwYlku3FZzWY6HuFxsZYaF7gSY/AWcY=
+github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240508141308-416ecaf479d8 h1:a4oLYmbgvP8di+/IOYXnDa3Ky7LcEaPBmFkZGAERRCw=
+github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240508141308-416ecaf479d8/go.mod h1:hcVqKPtkg/49SbED/gEqOsCga5ErLmvpQsLB5Ecnz9k=
+github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240508141308-416ecaf479d8 h1:H2SWIyV+y3IasGUCG1/wy/7GQ8RLO6kRTZCYnRtxNm0=
+github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240508141308-416ecaf479d8/go.mod h1:rKnUyK/VWH8h8Usz90I49JOrSZLP55QhhXo/XuiGG5g=
+github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240508141308-416ecaf479d8 h1:UEPDTc64LyqAkHeONQAPy6dSeylLyB6ZuEhY0pfX1Nw=
+github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240508141308-416ecaf479d8/go.mod h1:lVv1CgyClHwgW5VnkxtnlYMZ093FHDjOWZ2wWrPFwd4=
+github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240508141308-416ecaf479d8 h1:J+fVU6AmDnLduVLk9A+LnJ14/DTeS2tKav6oJTEp+8Q=
+github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240508141308-416ecaf479d8/go.mod h1:3KcUMZbIfc2yAtIqUVDV2B/ga6f20OJVcpNEvsYp3Ao=
+github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240508141308-416ecaf479d8 h1:/X+QAKq/q2HEmVdsW9QfGryrrJiJB8qxB4G4gG2kKOI=
+github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240508141308-416ecaf479d8/go.mod h1:PYRe3SAiqU7/Z5r9bQm1bmOqGk+bYRcx9QcVOMJGFgk=
+github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240508141308-416ecaf479d8 h1:8hIL7Ca4p7XYqxaUhxv4rBjTpruQlzG00ZXhuOs5MTw=
+github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240508141308-416ecaf479d8/go.mod h1:WK3e7yoVDEdU2wygztXJq4oap6OmUEWgXs/+EeK0N6U=
+github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240508141308-416ecaf479d8 h1:Y3LlyCwEZtNtqH2lXOcI6jJL6vnMLlWzyWaXG6Z1JhI=
+github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240508141308-416ecaf479d8/go.mod h1:5mPuadzKxGVO2k9j/c23Q6misGE7wxYniJdBQ8tE+S4=
+github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240508141308-416ecaf479d8 h1:enGUWvJTDjm1xg/W27P3kYCJnkWQ1TIDZouJihHRqkQ=
+github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240508141308-416ecaf479d8/go.mod h1:HMmv7N9wOjHZrbf1YqRgMErFEpTqFOcIiut+GURNUDY=
+github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240508141308-416ecaf479d8 h1:AektAFrm+f10nTnve8pWCDcBAqNMCqfcOBlKotSScqM=
+github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240508141308-416ecaf479d8/go.mod h1:XGUW1T75Y4roafsC0O5ixBRF4Yqh72F6ofJidfyd7ug=
+github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240508141308-416ecaf479d8 h1:Xb5JomJETst3Lk+m4dY0s2bYV7boaBYJxMONAxDOH4Y=
+github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240508141308-416ecaf479d8/go.mod h1:W5+zUyc/kGg5H+dblnCDE8NvbipxORM5w10YbT6+SiM=
+github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240508141308-416ecaf479d8 h1:EB+hDxMndN1O5V9EgO2c13Hsc31Dh5KSvCnPm5uKe4Y=
+github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240508141308-416ecaf479d8/go.mod h1:ohENrW+TZNnuno7gvqHlzFzrI3zm6rOIoq0bAbYtn1o=
+github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240508141308-416ecaf479d8 h1:SAFDvga+o2ZNFsWtAXkxMvSdxHR0Pp7J9D+DnMbMF6E=
+github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240508141308-416ecaf479d8/go.mod h1:1o9ZKC10P81K3Hbq87MokusYZmOUIhBtVZpWM77lrGs=
+github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240508141308-416ecaf479d8 h1:2htcVaUMuicaiVps5zzMhuPA70yXF3PVZ75Yx9L2D1s=
+github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240508141308-416ecaf479d8/go.mod h1:fMgmy+6VTrNP/xhEj66IlGfRZLZU0r2c1hYS3U/uLfE=
+github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240508141308-416ecaf479d8 h1:yuovadZQFeTFNLNb4t4J1p5/dU6CXIwtpf3BpLJndhs=
+github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240508141308-416ecaf479d8/go.mod h1:EX7y9N2qRhJAneA2tQkdpT3a00BrQ7D4GfWUoM1kiEc=
+github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240508141308-416ecaf479d8 h1:y3LllnybE7345UsaUGREpnoAZ1Ws7d6lNWO/4rSHfJk=
+github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240508141308-416ecaf479d8/go.mod h1:A6RR84Xj6s1lgkxYAD/pU6u/4umbP5RQ64vM0P1kGig=
+github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240508141308-416ecaf479d8 h1:GU2c+lm4bAwzONDR8IkAXvwMCO1d1kPRsXJ0kAoD6Ho=
+github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240508141308-416ecaf479d8/go.mod h1:tjy5O1L/8+AVf1sJ4QNuQSy6yUxB+8XKp/57p4s3oXU=
+github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240508141308-416ecaf479d8 h1:1h/MX6ZITQncU2R/a+vtH1VY6ZqV9GCDRnJq/rFL3eA=
+github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240508141308-416ecaf479d8/go.mod h1:FQy6hmOWj0VRRbVgtj8NqBuAlNsl9ioRTWSBWnYMNf0=
+github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240508141308-416ecaf479d8 h1:zNRC7dZ7fVuq2fMhqCoc0qQyPWn0IDHpB9nnXUc+PGw=
+github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240508141308-416ecaf479d8/go.mod h1:NgGcteIwIAy0r/PqqWnL3Jv78EKxdsw6LYgW6vhvBwY=
+github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240508141308-416ecaf479d8 h1:tigL33DUB6NNhpqeGkGRtxq4SvDZVPzHk3ivSD5T/6Y=
+github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240508141308-416ecaf479d8/go.mod h1:T1rrpTODDkDjEqupzhkEFdV1cy7MIiYvJq6inj2r0DA=
+github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240508141308-416ecaf479d8 h1:tO/t0dfQqHICdah6/409puTEsvap87qEcG9kehM7PLw=
+github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240508141308-416ecaf479d8/go.mod h1:aqPYdSTRGLeQ5zysObqnK3oQ0suNhDJ3DflZKfPjPFc=
+github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240508141308-416ecaf479d8 h1:s550KJgx/NeV5g3qfsJQWqGiG9TX9nP21Lapf6rrBHM=
+github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240508141308-416ecaf479d8/go.mod h1:nUYBUMVG4iQ6Z8Zywo64kbAxFJorSvZ5dthvNTZYTwY=
 github.com/openshift/library-go v0.0.0-20231017173800-126f85ed0cc7 h1:pJLcCSJzdiWCaJ4bAepgnvwMdP33LumbVJyWSW7+3ng=
 github.com/openshift/library-go v0.0.0-20231017173800-126f85ed0cc7/go.mod h1:jgxNp8aApJnZtECid9SUSr5Bu6DLo8Hfdv1DgFZaYA8=
 github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e h1:WgaylNSIB4uff7ieewaqIiEG3mP6jSMER8LCkoOEkys=
diff --git a/packaging/crio.conf.d/microshift_amd64.conf b/packaging/crio.conf.d/microshift_amd64.conf
index ab7af3b6ff..fcd8e32218 100644
--- a/packaging/crio.conf.d/microshift_amd64.conf
+++ b/packaging/crio.conf.d/microshift_amd64.conf
@@ -25,6 +25,6 @@ plugin_dirs = [
 # for community builds on top of OKD, this setting has no effect
 [crio.image]
 global_auth_file="/etc/crio/openshift-pull-secret"
-pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9280df3d25f773251f1179fe9defd8bba30413b86e978920ec3231f65843b0d8"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91007cd2d585f070bd46eea76e09034149fa1796a4c204abc6c320df60d790ba"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"
diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt
index e69de29bb2..aa6713c11a 100644
--- a/scripts/auto-rebase/changelog.txt
+++ b/scripts/auto-rebase/changelog.txt
@@ -0,0 +1,22 @@
+- kubernetes embedded-component 8ca71f701a70cb3eed8603478e5f6c1676319fc4 to 416ecaf479d8fa342937068dede6481f5c7a1441
+  - da3c5db4b 2024-05-07T10:43:04+00:00 UPSTREAM: <carry>: Provide SCC access via RBAC
+
+- machine-config-operator embedded-component 1b35c4e05377a34e8403108837bb6773e2c3566d to 10694c7cc870f32bc7bf1888d1b8199f13119ff4
+  - 0b190004 2024-05-07T15:54:22-04:00 Don't error if the certs.d dir doesn't exist yet
+
+- ovn-kubernetes image-amd64 c108b9f7bb51ad5462f410e54eb2177103c86ee5 to 7fab1ff7a30e89dc2c65ecb86784a84ef4026dbb
+  - 51441bb 2024-05-07T16:19:20+02:00 Fix endpoint selection for externalTrafficPolicy=local
+  - 77f6635 2024-05-06T22:32:48-04:00 CARRY: fix ordering of MCS blocking iptables rules
+  - fd072ed 2024-05-06T21:57:20-04:00 Fixes regression to service openflow rules
+  - b20d82c 2024-05-06T21:56:54-04:00 Various fixes and improvements to iptables stuff
+  - 8e4fcf9 2024-05-06T21:56:45-04:00 Fixes iptables issue where SNAT rules were being added multiple times
+  - fd5762c 2024-05-06T21:56:32-04:00 Adds iptables-restore capability for service sync
+  - 45c2ee4 2024-05-06T21:56:19-04:00 Vendor trozet/go-iptables
+  - 37d4a80 2024-05-06T21:54:05-04:00 Fixes inefficient service parsing
+  - 0343a8e 2024-05-06T11:50:38-04:00 Improves service iptables efficiency on start up
+  - 133eedb 2024-05-01T01:54:52-04:00 bump OVS version
+  - 32d2ce1 2024-04-10T15:30:47+02:00 Full implementation of KEP-1669 ProxyTerminatingEndpoints
+
+- kubernetes image-amd64 8ca71f701a70cb3eed8603478e5f6c1676319fc4 to 416ecaf479d8fa342937068dede6481f5c7a1441
+  - da3c5db4b 2024-05-07T10:43:04+00:00 UPSTREAM: <carry>: Provide SCC access via RBAC
+
diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt
index af66e0afba..841fbbd4de 100644
--- a/scripts/auto-rebase/commits.txt
+++ b/scripts/auto-rebase/commits.txt
@@ -9,9 +9,9 @@ https://github.com/openshift/cluster-openshift-controller-manager-operator embed
 https://github.com/openshift/cluster-policy-controller embedded-component cc48f3152213bfe6e42fdd82f760246e862d208f
 https://github.com/openshift/csi-external-snapshotter embedded-component 4f2955c7c90cd150f9dfae782148d0fa8eba7342
 https://github.com/openshift/etcd embedded-component a7005ef1eae85eec6c59411860538169cea182fd
-https://github.com/openshift/kubernetes embedded-component 8ca71f701a70cb3eed8603478e5f6c1676319fc4
+https://github.com/openshift/kubernetes embedded-component 416ecaf479d8fa342937068dede6481f5c7a1441
 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component e8749689edb8e7fea42eca5f2b67c3187192cdeb
-https://github.com/openshift/machine-config-operator embedded-component 1b35c4e05377a34e8403108837bb6773e2c3566d
+https://github.com/openshift/machine-config-operator embedded-component 10694c7cc870f32bc7bf1888d1b8199f13119ff4
 https://github.com/openshift/openshift-controller-manager embedded-component cdba57f4d73d86ec73394081bbeef487af5ec08c
 https://github.com/openshift/operator-framework-olm embedded-component 50f148e2b1ed9eed9625d03f0d754bca53da1414
 https://github.com/openshift/route-controller-manager embedded-component c5cc7a73705e4086759e2a36811b055b7716def4
@@ -23,8 +23,8 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd1
 https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd150f9dfae782148d0fa8eba7342
 https://github.com/openshift/router image-amd64 4b6be4ddcbe7dae2b08f305fc823d1718f2563f7
 https://github.com/openshift/kube-rbac-proxy image-amd64 e8e8c84bcc6d4419970726f3028df4b178c0b1c9
-https://github.com/openshift/ovn-kubernetes image-amd64 c108b9f7bb51ad5462f410e54eb2177103c86ee5
-https://github.com/openshift/kubernetes image-amd64 8ca71f701a70cb3eed8603478e5f6c1676319fc4
+https://github.com/openshift/ovn-kubernetes image-amd64 7fab1ff7a30e89dc2c65ecb86784a84ef4026dbb
+https://github.com/openshift/kubernetes image-amd64 416ecaf479d8fa342937068dede6481f5c7a1441
 https://github.com/openshift/service-ca-operator image-amd64 f5972cc74670c274bdc2b29d0903c4ed0432b9ca
 https://github.com/openshift/oc image-arm64 7693229513083646fe3a83a0fec6e651e4866d8d
 https://github.com/openshift/coredns image-arm64 22f950eae53fcba187c2303ac4f1a8305b6c1c8a
diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh
index 000608588a..d5edbee0c6 100755
--- a/scripts/auto-rebase/last_rebase.sh
+++ b/scripts/auto-rebase/last_rebase.sh
@@ -1,2 +1,2 @@
 #!/bin/bash -x
-./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-05-08-194059" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-05-13-200905"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-05-14-175553" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-05-14-190638"
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 678d6049b2..36a4c44a43 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1363,7 +1363,7 @@ gopkg.in/yaml.v2
 # gopkg.in/yaml.v3 v3.0.1
 ## explicit
 gopkg.in/yaml.v3
-# k8s.io/api v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/api v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/api/admission/v1
 k8s.io/api/admission/v1beta1
@@ -1420,7 +1420,7 @@ k8s.io/api/scheduling/v1beta1
 k8s.io/api/storage/v1
 k8s.io/api/storage/v1alpha1
 k8s.io/api/storage/v1beta1
-# k8s.io/apiextensions-apiserver v0.28.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/apiextensions-apiserver v0.28.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/apiextensions-apiserver/pkg/apihelpers
 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
@@ -1467,7 +1467,7 @@ k8s.io/apiextensions-apiserver/pkg/generated/openapi
 k8s.io/apiextensions-apiserver/pkg/registry/customresource
 k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor
 k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition
-# k8s.io/apimachinery v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/apimachinery v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/apimachinery/pkg/api/equality
 k8s.io/apimachinery/pkg/api/errors
@@ -1534,7 +1534,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/apiserver v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/apiserver/pkg/admission
 k8s.io/apiserver/pkg/admission/cel
@@ -1699,13 +1699,13 @@ k8s.io/apiserver/plugin/pkg/audit/webhook
 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/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/client-go v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/client-go/applyconfigurations/admissionregistration/v1
 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1
@@ -2042,7 +2042,7 @@ k8s.io/client-go/util/jsonpath
 k8s.io/client-go/util/keyutil
 k8s.io/client-go/util/retry
 k8s.io/client-go/util/workqueue
-# k8s.io/cloud-provider v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/cloud-provider v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/cloud-provider
 k8s.io/cloud-provider/api
@@ -2065,14 +2065,14 @@ 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-20240502205528-8ca71f701a70
+# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/cluster-bootstrap/token/api
 k8s.io/cluster-bootstrap/token/jws
 k8s.io/cluster-bootstrap/token/util
 k8s.io/cluster-bootstrap/util/secrets
 k8s.io/cluster-bootstrap/util/tokens
-# k8s.io/component-base v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/component-base v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/component-base/cli
 k8s.io/component-base/cli/flag
@@ -2106,7 +2106,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/component-helpers v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/component-helpers/apimachinery/lease
 k8s.io/component-helpers/apps/poddisruptionbudget
@@ -2119,7 +2119,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/controller-manager v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/controller-manager/app
 k8s.io/controller-manager/config
@@ -2136,19 +2136,19 @@ k8s.io/controller-manager/pkg/informerfactory
 k8s.io/controller-manager/pkg/leadermigration
 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-20240502205528-8ca71f701a70
+# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/cri-api/pkg/apis
 k8s.io/cri-api/pkg/apis/runtime/v1
 k8s.io/cri-api/pkg/errors
-# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 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-20240502205528-8ca71f701a70
+# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/dynamic-resource-allocation/resourceclaim
-# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/endpointslice
 k8s.io/endpointslice/metrics
@@ -2170,13 +2170,13 @@ k8s.io/klog/v2/internal/clock
 k8s.io/klog/v2/internal/dbg
 k8s.io/klog/v2/internal/serialize
 k8s.io/klog/v2/internal/severity
-# k8s.io/kms v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/kms v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 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.28.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/kube-aggregator v0.28.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/kube-aggregator/pkg/apis/apiregistration
 k8s.io/kube-aggregator/pkg/apis/apiregistration/install
@@ -2207,7 +2207,7 @@ k8s.io/kube-aggregator/pkg/controllers/status
 k8s.io/kube-aggregator/pkg/registry/apiservice
 k8s.io/kube-aggregator/pkg/registry/apiservice/etcd
 k8s.io/kube-aggregator/pkg/registry/apiservice/rest
-# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/kube-controller-manager/config/v1alpha1
 # k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
@@ -2240,12 +2240,12 @@ 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-20240502205528-8ca71f701a70
+# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/kube-scheduler/config/v1
 k8s.io/kube-scheduler/config/v1beta3
 k8s.io/kube-scheduler/extender/v1
-# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/kubectl/pkg/apps
 k8s.io/kubectl/pkg/cmd/apiresources
@@ -2280,7 +2280,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/kubelet v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/kubelet/config/v1
 k8s.io/kubelet/config/v1alpha1
@@ -2301,7 +2301,7 @@ k8s.io/kubelet/pkg/apis/stats/v1alpha1
 k8s.io/kubelet/pkg/cri/streaming
 k8s.io/kubelet/pkg/cri/streaming/portforward
 k8s.io/kubelet/pkg/cri/streaming/remotecommand
-# k8s.io/kubernetes v1.28.3 => github.com/openshift/kubernetes v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/kubernetes v1.28.3 => github.com/openshift/kubernetes v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/kubernetes/cmd/kube-apiserver/app
 k8s.io/kubernetes/cmd/kube-apiserver/app/options
@@ -3106,7 +3106,7 @@ 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/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/legacy-cloud-providers/azure
 k8s.io/legacy-cloud-providers/azure/auth
@@ -3148,7 +3148,7 @@ k8s.io/legacy-cloud-providers/gce/gcpcredential
 k8s.io/legacy-cloud-providers/vsphere
 k8s.io/legacy-cloud-providers/vsphere/vclib
 k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers
-# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/metrics/pkg/apis/custom_metrics
 k8s.io/metrics/pkg/apis/custom_metrics/v1beta1
@@ -3163,10 +3163,10 @@ k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1
 k8s.io/metrics/pkg/client/custom_metrics
 k8s.io/metrics/pkg/client/custom_metrics/scheme
 k8s.io/metrics/pkg/client/external_metrics
-# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/mount-utils
-# k8s.io/pod-security-admission v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/pod-security-admission v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240508141308-416ecaf479d8
 ## explicit; go 1.20
 k8s.io/pod-security-admission/admission
 k8s.io/pod-security-admission/admission/api
@@ -3317,38 +3317,38 @@ sigs.k8s.io/structured-merge-diff/v4/value
 ## explicit; go 1.12
 sigs.k8s.io/yaml
 # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e
-# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240502205528-8ca71f701a70
-# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240508141308-416ecaf479d8
+# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240508141308-416ecaf479d8
 # go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240424135504-a7005ef1eae8
 # go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240424135504-a7005ef1eae8
 # go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240424135504-a7005ef1eae8
 # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8
-# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240502205528-8ca71f701a70
+# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240508141308-416ecaf479d8