NO-ISSUE: rebase-release-5.0-5.0.0-0.nightly-2026-04-26-064718_amd64-2026-04-26_arm64-2026-04-26

Makefile.kube_git.var

@@ -1,5 +1,5 @@
 KUBE_GIT_MAJOR=1
 KUBE_GIT_MINOR=35
 KUBE_GIT_VERSION=v1.35.3
-KUBE_GIT_COMMIT=354a124256da76c98d191bf53149eb4578fee0d7
+KUBE_GIT_COMMIT=757ccdfcf9a1f89059acaba311c3625c495a6732
 KUBE_GIT_TREE_STATE=clean

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 5.0.0-0.nightly-arm64-2026-04-23-082815
+OCP_VERSION := 5.0.0-0.nightly-arm64-2026-04-26-061912

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 5.0.0-0.nightly-2026-04-21-130601
+OCP_VERSION := 5.0.0-0.nightly-2026-04-26-064718

assets/components/multus/kustomization.aarch64.yaml

@@ -2,7 +2,7 @@
 images:
   - name: multus-cni-microshift
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:90c894ac917474b769ce3cb76375ab42b7968b023aff63b54da30a24875d9a27
+    digest: sha256:0ff82fc01ef11f9c8c967b068a153081a4b19165eaa15fbb7f6f26e722f57bb9
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:a17a7d9a3c1f81457e41ff8780c0d0cc7833fae538546b927623a3687014e7ae
+    digest: sha256:6c85c16c63d0c4a0aa3b9d1ddbf07a4fed224ee680fab72167d80039d9d1db6d

assets/components/multus/kustomization.x86_64.yaml

@@ -2,7 +2,7 @@
 images:
   - name: multus-cni-microshift
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:2ae14f7c28b08879fa5eaac54b0633763aa520b1050ce12b7f9a9b20e7320fee
+    digest: sha256:4a17e2f198c051b22b7bde9f9598a0571b1f9ba2b0647a53d9148114caedc3bc
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:c47c93fc9cd493faad1e90fdb8b3ffb8d63c1823b8ee9db769a690b074675454
+    digest: sha256:0deefd19802c33a9c95d95d85480e14f67dc8517fa0c35b0f61de931d4b6217f

assets/components/multus/release-multus-aarch64.json

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-arm64-2026-04-23-082815"
+    "base": "5.0.0-0.nightly-arm64-2026-04-26-061912"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:90c894ac917474b769ce3cb76375ab42b7968b023aff63b54da30a24875d9a27",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a17a7d9a3c1f81457e41ff8780c0d0cc7833fae538546b927623a3687014e7ae"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0ff82fc01ef11f9c8c967b068a153081a4b19165eaa15fbb7f6f26e722f57bb9",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6c85c16c63d0c4a0aa3b9d1ddbf07a4fed224ee680fab72167d80039d9d1db6d"
   }
 }

assets/components/multus/release-multus-x86_64.json

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-2026-04-21-130601"
+    "base": "5.0.0-0.nightly-2026-04-26-064718"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:2ae14f7c28b08879fa5eaac54b0633763aa520b1050ce12b7f9a9b20e7320fee",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c47c93fc9cd493faad1e90fdb8b3ffb8d63c1823b8ee9db769a690b074675454"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4a17e2f198c051b22b7bde9f9598a0571b1f9ba2b0647a53d9148114caedc3bc",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0deefd19802c33a9c95d95d85480e14f67dc8517fa0c35b0f61de931d4b6217f"
   }
 }

assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json

@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "2.25.5"
+    "base": "2.25.6"
   },
   "images": {
     "ray-tls-generator-image": "registry.redhat.io/ubi9/ubi-minimal:latest",

assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml

@@ -2,26 +2,26 @@
 images:
   - name: quay.io/operator-framework/olm
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:00179da0a7a493f6615b680684eb8f5d134098517d2d6b60920d75e249cfc012
+    digest: sha256:b96dd6dc0b0c403ba36dd7166ea5c0e8ac874b6bd482c91853dafda62471bcf3
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:77329201b8d84bf7b960f6f75128393af37745950673cda8e887f16279d477bf
+    digest: sha256:dd783995e5f3ed48d50f06be68ed27c76271f65c896003a17a65355636828a40
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:e02bdb1876a065d865fdf87aef70e9ed0d793fd529b22e810b226de09c4f9d6b
+    digest: sha256:188e0afb591fde5922b2a3df21597a7f42a4e1e1f3b4e1e68f66b9691be5a6da
 
 patches:
   - patch: |-
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:77329201b8d84bf7b960f6f75128393af37745950673cda8e887f16279d477bf
+         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:dd783995e5f3ed48d50f06be68ed27c76271f65c896003a17a65355636828a40
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OLM_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:00179da0a7a493f6615b680684eb8f5d134098517d2d6b60920d75e249cfc012
+         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b96dd6dc0b0c403ba36dd7166ea5c0e8ac874b6bd482c91853dafda62471bcf3
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml

@@ -2,26 +2,26 @@
 images:
   - name: quay.io/operator-framework/olm
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:016073edd8a5ab5e32adf8dc4b83ddc8793fb2acd1fe06916b9c0ab6eebf9f66
+    digest: sha256:043bf8e359196085290e24ae47f897f1befa89b336ca5a89dad843044ec74b39
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:103b079fb52ae76b17097d84ef18c36f4a56ac508da4050be78587c5a0ef8909
+    digest: sha256:fc1c3b770c61569f1377211fc150df061796335efac1d75e456258d319fc271d
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:6b5b450a53fc73478a134aecd2490b4f0709a9678bd2d81186b853f588a67c62
+    digest: sha256:63f598debd51e32a3af22d3830d903ebcd78a8887265c09f04c71e2ad7470b3d
 
 patches:
   - patch: |-
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:103b079fb52ae76b17097d84ef18c36f4a56ac508da4050be78587c5a0ef8909
+         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:fc1c3b770c61569f1377211fc150df061796335efac1d75e456258d319fc271d
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OLM_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:016073edd8a5ab5e32adf8dc4b83ddc8793fb2acd1fe06916b9c0ab6eebf9f66
+         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:043bf8e359196085290e24ae47f897f1befa89b336ca5a89dad843044ec74b39
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

assets/optional/operator-lifecycle-manager/release-olm-aarch64.json

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-arm64-2026-04-23-082815"
+    "base": "5.0.0-0.nightly-arm64-2026-04-26-061912"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:00179da0a7a493f6615b680684eb8f5d134098517d2d6b60920d75e249cfc012",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:77329201b8d84bf7b960f6f75128393af37745950673cda8e887f16279d477bf",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e02bdb1876a065d865fdf87aef70e9ed0d793fd529b22e810b226de09c4f9d6b"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b96dd6dc0b0c403ba36dd7166ea5c0e8ac874b6bd482c91853dafda62471bcf3",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:dd783995e5f3ed48d50f06be68ed27c76271f65c896003a17a65355636828a40",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:188e0afb591fde5922b2a3df21597a7f42a4e1e1f3b4e1e68f66b9691be5a6da"
   }
 }

assets/optional/operator-lifecycle-manager/release-olm-x86_64.json

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-2026-04-21-130601"
+    "base": "5.0.0-0.nightly-2026-04-26-064718"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:016073edd8a5ab5e32adf8dc4b83ddc8793fb2acd1fe06916b9c0ab6eebf9f66",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:103b079fb52ae76b17097d84ef18c36f4a56ac508da4050be78587c5a0ef8909",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6b5b450a53fc73478a134aecd2490b4f0709a9678bd2d81186b853f588a67c62"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:043bf8e359196085290e24ae47f897f1befa89b336ca5a89dad843044ec74b39",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:fc1c3b770c61569f1377211fc150df061796335efac1d75e456258d319fc271d",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:63f598debd51e32a3af22d3830d903ebcd78a8887265c09f04c71e2ad7470b3d"
   }
 }

assets/release/release-aarch64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-arm64-2026-04-23-082815"
+    "base": "5.0.0-0.nightly-arm64-2026-04-26-061912"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0220ed3dd109e72a721a6ef66a694d6d755b3ee61db98f6ac4bcf8b4f8a0ea5f",
-    "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:48de8f04244f2339e9b5150f81d46f9080aec145246fbbfd20c89da8802c5e3e",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1ce1b4e22b0fec4545f011e394ad07a4db6ecf67a652e1899bf409d2040ab907",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e02bdb1876a065d865fdf87aef70e9ed0d793fd529b22e810b226de09c4f9d6b",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d6ed1f28c38245087b3049754194cd597223cda6f553069599538be7540ca7b0",
-    "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:83108707cd14cdae145c255d84371cb7d0437e183dc6a43133ca785239948291",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:169e0488e871ff975d39c4bf959cfe14cce913ffe35ddf2986f904606dcd577a",
+    "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b45003e3d4165bc1be8d60a0d3e1dcf8ba09f43e899a37644bc9b2a5ffe31465",
+    "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ce6323527616cf848ecffc431bbd356c94e99a8a4d0d8b6133fdbf962e7654d6",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:17552ef39754cf1b53c4c96dd107d1a0f59213a695bfff31d5a21acf941fa84a",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:188e0afb591fde5922b2a3df21597a7f42a4e1e1f3b4e1e68f66b9691be5a6da",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d9a45a6d73117cc3dbc49d6525ab2002f9fba659d59bd81491654f766af70ef0",
+    "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:38547ae2d0f8c57fbb5f2513434725013f738a9bd59850e593ec60ce7c07b3f9",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:20f72cb0464291673aad8cfee875a822514b307d2326b70f2bf3caa8ccd3048a",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9fb7758558394d92954be3f124864a5e623175b58c1a00fb1c1330834304068b"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0948fefd33dca6abef683a5280b79e0766c11ffccd9780e66de363d774331196"
   }
 }

assets/release/release-x86_64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-2026-04-21-130601"
+    "base": "5.0.0-0.nightly-2026-04-26-064718"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:43db4c2fad88732b37b8c851fe5d193b683a1a653c2099af8e3c9e3a28f5798e",
-    "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6b13ddd3bc829f67f56ceb62c43a2787512012e0abe6aaa05fb905254f7e7f47",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ec5429411f479e519c40865175ab66f736b5a94495558603fa5b3d12ed785eff",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6b5b450a53fc73478a134aecd2490b4f0709a9678bd2d81186b853f588a67c62",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a13f5afc3dd0f80e9abe15f8bc86197acf243f4bd1ca602ac6a107842e550ff8",
-    "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7b23a09a3b70ff2f56547ce70ae4f47158758c393d3200e9b9b78ad070145bf2",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:27822d45b23589968ae5db89640ee3303e94527d80ebcd5c03ade8efce4d6b68",
+    "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c0a99e7ce0c77a177a080c98aaec65cb82ae271ea4361af95d482c35146941e0",
+    "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:16945dcf0fcb6fd973d86d652ce07508664b6f05f97d93815bc23a9428113167",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9e0561ec6ce2c97f052462a35a6db4c9c9fe46353303dbd25e571e81e7002bbc",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:63f598debd51e32a3af22d3830d903ebcd78a8887265c09f04c71e2ad7470b3d",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1312092b993a8e7fe8571fdd075041cb00bf51084740b2230ac499ee7b09d3eb",
+    "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:088275e7747673d89ea45429f8d360c2e9ddc056107cd92e64377ea7ad3c62c0",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ebaa67c44356ad9b899f04b675772d0f59c4b78e141257816522f2ecf591808b",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:dd06fe1deea877cddb398502c43e6ec98aab3ff807026e2036c44d8d364f035a"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c0db5cd9a538815edcb434e47977ec131cd8057c7626185e5cd595a6c20566e8"
   }
 }

deps/github.com/openshift/kubernetes/test/e2e/dra/utils/deploy.go

@@ -75,6 +75,7 @@ import (
 	e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
 	"k8s.io/kubernetes/test/e2e/storage/drivers/proxy"
 	"k8s.io/kubernetes/test/e2e/storage/utils"
+	"k8s.io/kubernetes/test/utils/image"
 	"k8s.io/utils/clock"
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/yaml"
@@ -451,36 +452,67 @@ func (d *Driver) SetUp(nodes *Nodes, driverResources map[string]resourceslice.Dr
 		}
 	}
 
-	manifests := []string{
-		// The code below matches the content of this manifest (ports,
-		// container names, etc.).
-		"test/e2e/testing-manifests/dra/dra-test-driver-proxy.yaml",
-	}
-
 	// Create service account and corresponding RBAC rules.
 	d.serviceAccountName = "dra-kubelet-plugin-" + d.Name + d.InstanceSuffix + "-service-account"
 	content := example.PluginPermissions
 	content = strings.ReplaceAll(content, "dra-kubelet-plugin-namespace", d.f.Namespace.Name)
 	content = strings.ReplaceAll(content, "dra-kubelet-plugin", "dra-kubelet-plugin-"+d.Name+d.InstanceSuffix)
 	d.createFromYAML(ctx, []byte(content), d.f.Namespace.Name)
 
+	// Figure out which hostpathplugin to use: basically the latest one
+	// from the test/e2e/testing-manifests/storage-csi manifests. That is
+	// where SIG Storage maintains the versions of the hostpath image which
+	// are part of Kubernetes E2E testing. test/utils/image parses those files.
+	//
+	// We piggy-back on that instead of controlling the version ourselves
+	// because it reduces effort, at the risk of unexpected
+	// breakage. Another benefit is that -list-images and registry patching
+	// via test/utils/image + KUBE_TEST_REPO_LIST work.
+	hostPathImage := "registry.k8s.io/sig-storage/hostpathplugin"
+	hostPathVersion := ""
+	for _, config := range image.GetOriginalImageConfigs() {
+		parts := strings.SplitN(config.GetE2EImage(), ":", 2)
+		if len(parts) < 2 {
+			continue
+		}
+		image, version := parts[0], parts[1]
+		if image != hostPathImage {
+			continue
+		}
+		// "Dumb" string comparison is good enough for e.g. v1.16.1 < v1.17.0.
+		// It seems unlikely that any major/patch will need more than one digit
+		// or that version grow beyond 99.
+		if hostPathVersion == "" || hostPathVersion < version {
+			hostPathVersion = version
+		}
+	}
+	origImageURL := hostPathImage + ":" + hostPathVersion
+	patchedImageURL, err := image.ReplaceRegistryInImageURL(origImageURL)
+	framework.ExpectNoError(err, "look up E2E image")
+
 	// Using a ReplicaSet instead of a DaemonSet has the advantage that we can control
 	// the lifecycle explicitly, in particular run two pods per node long enough to
 	// run checks.
+	manifests := []string{
+		// The code below matches the content of this manifest (ports,
+		// container names, etc.).
+		"test/e2e/testing-manifests/dra/dra-test-driver-proxy.yaml",
+	}
 	instanceKey := "app.kubernetes.io/instance"
 	rsName := ""
 	numNodes := int32(len(nodes.NodeNames))
 	pluginDataDirectoryPath := path.Join(framework.TestContext.KubeletRootDir, "plugins", d.Name)
 	registrarDirectoryPath := path.Join(framework.TestContext.KubeletRootDir, "plugins_registry")
 	instanceName := d.Name + d.InstanceSuffix
-	err := utils.CreateFromManifests(ctx, d.f, d.f.Namespace, func(item interface{}) error {
+	err = utils.CreateFromManifests(ctx, d.f, d.f.Namespace, func(item interface{}) error {
 		switch item := item.(type) {
 		case *appsv1.ReplicaSet:
 			item.Name += d.NameSuffix + d.InstanceSuffix
 			rsName = item.Name
 			item.Spec.Replicas = &numNodes
 			item.Spec.Selector.MatchLabels[instanceKey] = instanceName
 			item.Spec.Template.Labels[instanceKey] = instanceName
+			item.Spec.Template.Spec.Containers[0].Image = patchedImageURL
 			item.Spec.Template.Spec.ServiceAccountName = d.serviceAccountName
 			item.Spec.Template.Spec.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[0].LabelSelector.MatchLabels[instanceKey] = instanceName
 			item.Spec.Template.Spec.Affinity.NodeAffinity = &v1.NodeAffinity{

deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/dra/dra-test-driver-proxy.yaml

@@ -47,7 +47,7 @@ spec:
 
       containers:
         - name: pause
-          image: registry.k8s.io/sig-storage/hostpathplugin:v1.16.1
+          image: registry.k8s.io/sig-storage/hostpathplugin:to-be-replaced # Version and actual registry get patched in during deployment.
           command:
             - /bin/sh
             - -c

deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/external-snapshotter/volume-group-snapshots/csi-hostpath-plugin.yaml

@@ -219,7 +219,7 @@ spec:
       serviceAccountName: csi-hostpathplugin-sa
       containers:
         - name: hostpath
-          image: registry.k8s.io/sig-storage/hostpathplugin:v1.16.1
+          image: registry.k8s.io/sig-storage/hostpathplugin:v1.17.1
           args:
             - "--drivername=hostpath.csi.k8s.io"
             - "--v=5"

deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml

@@ -237,7 +237,7 @@ spec:
       serviceAccountName: csi-hostpathplugin-sa
       containers:
         - name: hostpath
-          image: registry.k8s.io/sig-storage/hostpathplugin:v1.17.0
+          image: registry.k8s.io/sig-storage/hostpathplugin:v1.17.1
           args:
             - "--drivername=hostpath.csi.k8s.io"
             - "--v=5"

deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml

@@ -53,7 +53,7 @@ spec:
           - mountPath: /registration
             name: registration-dir
         - name: mock
-          image: registry.k8s.io/sig-storage/hostpathplugin:v1.17.0
+          image: registry.k8s.io/sig-storage/hostpathplugin:v1.17.1
           args:
             - "--drivername=mock.storage.k8s.io"
             - "--nodeid=$(KUBE_NODE_NAME)"

deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/mock/csi-mock-proxy.yaml

@@ -53,7 +53,7 @@ spec:
           - mountPath: /registration
             name: registration-dir
         - name: mock
-          image: registry.k8s.io/sig-storage/hostpathplugin:v1.17.0
+          image: registry.k8s.io/sig-storage/hostpathplugin:v1.17.1
           args:
             - -v=5
             - -nodeid=$(KUBE_NODE_NAME)