NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2026-04-05-174132_amd64-2026-04-05_arm64-2026-04-05

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.18.0-0.nightly-arm64-2026-04-01-232144
+OCP_VERSION := 4.18.0-0.nightly-arm64-2026-04-05-230919

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 4.18.0-0.nightly-2026-03-26-041753
+OCP_VERSION := 4.18.0-0.nightly-2026-04-05-174132

assets/optional/multus/kustomization.aarch64.yaml

@@ -2,7 +2,7 @@
 images:
   - name: multus-cni-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:91edf5679018055bc2cb9189d05aee7f35f339ad6e8abf7e1ef37a90c3c6ff35
+    digest: sha256:6e913673a2d54a73c776d9c590f16318d96208434f36a198935bc55a00911a56
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:603116084aa76b58e42c6b438cf02e9627339e98943797592291f518dcf5fb06
+    digest: sha256:074b93632403f5d7d9f8707306f2cfaf3661db864f86b910c3aca0aed6c6be0f

assets/optional/multus/kustomization.x86_64.yaml

@@ -2,7 +2,7 @@
 images:
   - name: multus-cni-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:7d3fb12c06d836f670823aa5d9851f9064ad5504ff28dabd6c7d4fd580b26a3e
+    digest: sha256:acf2bc2a822a8fd18084574f47abdedde48399d5644564cfd2bf904a43b2d2d5
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:b5f2899d84420d8a96f80560e619f7aeaee99f9abe99a7e922b78b342ec063ce
+    digest: sha256:d8ff68ddaf9b9637aa963f343a94065b1cd7f97d99f6360ecabc90c489d0909a

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2026-04-01-232144"
+    "base": "4.18.0-0.nightly-arm64-2026-04-05-230919"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91edf5679018055bc2cb9189d05aee7f35f339ad6e8abf7e1ef37a90c3c6ff35",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:603116084aa76b58e42c6b438cf02e9627339e98943797592291f518dcf5fb06"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e913673a2d54a73c776d9c590f16318d96208434f36a198935bc55a00911a56",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:074b93632403f5d7d9f8707306f2cfaf3661db864f86b910c3aca0aed6c6be0f"
   }
 }

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2026-03-26-041753"
+    "base": "4.18.0-0.nightly-2026-04-05-174132"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d3fb12c06d836f670823aa5d9851f9064ad5504ff28dabd6c7d4fd580b26a3e",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5f2899d84420d8a96f80560e619f7aeaee99f9abe99a7e922b78b342ec063ce"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:acf2bc2a822a8fd18084574f47abdedde48399d5644564cfd2bf904a43b2d2d5",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8ff68ddaf9b9637aa963f343a94065b1cd7f97d99f6360ecabc90c489d0909a"
   }
 }

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-v4.0-art-dev
-    digest: sha256:80cf4182b92e8a5baf4bddec2e8000ff41ccced7abfb674bbdac9681a16d90aa
+    digest: sha256:5ea468fe43f65cae55d2a3111328be750dd14d5f82de569a0c03069908c0425c
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:bf7796a72d725021fd1416e93b53535d9ea7adc7bf3168bde1ca2589a637253c
+    digest: sha256:67b554dbc7e693cd37f174ad18a99e1a95083af7da891668bf20df14f4aaa313
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:929d27000955d2ca2913ba8a380e0311762522a5c1cd6a8ae1790d6f1d7b4e57
+    digest: sha256:bb17e91a525a6043ef6194d311a4c95182120955cc22651e7f59a9fb5b2aee21
 
 patches:
   - patch: |-
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf7796a72d725021fd1416e93b53535d9ea7adc7bf3168bde1ca2589a637253c
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:67b554dbc7e693cd37f174ad18a99e1a95083af7da891668bf20df14f4aaa313
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OLM_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80cf4182b92e8a5baf4bddec2e8000ff41ccced7abfb674bbdac9681a16d90aa
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ea468fe43f65cae55d2a3111328be750dd14d5f82de569a0c03069908c0425c
     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-v4.0-art-dev
-    digest: sha256:5754b2059fb61bd4bdc00fead0104c99de724995258d2cd6075ad3458c7aa065
+    digest: sha256:404a839519ea09ab8ee15897cb950b6ad52040e3c001a186284017bfe51c8d93
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:a253b6919f6a2de18fbaeecd4c94985787503c3dcfb7e55533841af83fba6f3b
+    digest: sha256:527b94d9cbd1e9240b0bd9bc2c5694b1ebcebbbc95e33adffde010bda658b206
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:3d7678f785f62a9559d4bb55d5bda97f1880cd1fb7a4d263307db0283c9b576b
+    digest: sha256:4f397655a3ccee89cb91d4835f30df3d19b1a041f901ffbc26fc651ce41f0818
 
 patches:
   - patch: |-
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a253b6919f6a2de18fbaeecd4c94985787503c3dcfb7e55533841af83fba6f3b
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:527b94d9cbd1e9240b0bd9bc2c5694b1ebcebbbc95e33adffde010bda658b206
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OLM_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5754b2059fb61bd4bdc00fead0104c99de724995258d2cd6075ad3458c7aa065
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:404a839519ea09ab8ee15897cb950b6ad52040e3c001a186284017bfe51c8d93
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2026-04-01-232144"
+    "base": "4.18.0-0.nightly-arm64-2026-04-05-230919"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80cf4182b92e8a5baf4bddec2e8000ff41ccced7abfb674bbdac9681a16d90aa",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf7796a72d725021fd1416e93b53535d9ea7adc7bf3168bde1ca2589a637253c",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:929d27000955d2ca2913ba8a380e0311762522a5c1cd6a8ae1790d6f1d7b4e57"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ea468fe43f65cae55d2a3111328be750dd14d5f82de569a0c03069908c0425c",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:67b554dbc7e693cd37f174ad18a99e1a95083af7da891668bf20df14f4aaa313",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb17e91a525a6043ef6194d311a4c95182120955cc22651e7f59a9fb5b2aee21"
   }
 }

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2026-03-26-041753"
+    "base": "4.18.0-0.nightly-2026-04-05-174132"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5754b2059fb61bd4bdc00fead0104c99de724995258d2cd6075ad3458c7aa065",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a253b6919f6a2de18fbaeecd4c94985787503c3dcfb7e55533841af83fba6f3b",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d7678f785f62a9559d4bb55d5bda97f1880cd1fb7a4d263307db0283c9b576b"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:404a839519ea09ab8ee15897cb950b6ad52040e3c001a186284017bfe51c8d93",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:527b94d9cbd1e9240b0bd9bc2c5694b1ebcebbbc95e33adffde010bda658b206",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f397655a3ccee89cb91d4835f30df3d19b1a041f901ffbc26fc651ce41f0818"
   }
 }

assets/release/release-aarch64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2026-04-01-232144"
+    "base": "4.18.0-0.nightly-arm64-2026-04-05-230919"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd5bcf11f7984af4287c26d66c2998238246f0c5c33676ab2fa0dd0c3ff35913",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1353f68fa50a0c2c1b5d874a37aa0672b99a0c10503aa63442892128f887acb0",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad58af0413f0400f3030d71068effea5861a34de07e4eeea57644a4ab5db684d",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:929d27000955d2ca2913ba8a380e0311762522a5c1cd6a8ae1790d6f1d7b4e57",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed0b5d8bf712266451cbe603b94607ebd07c008a1c75e5aae04e313609c43810",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c69b32e13ec1078af67b8ca94328f47fc8660e7aba8247638d8ee487a43f9e1e",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a951e448d3ef8f984e55301eea410c756ef82f146887111599bb553b175d604",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:313daa27719777efbd85a995cfecd8414767f7f032ba421ece190f35171e07c3",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80236b6471cce3b3259df5140ef9a19f0593b04c2e88394289f9b28ff2c96f38",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:08954b98fdf6663fc1da34ccd3d538fe12b339f390d9e3431e69566aa5653a6a",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb17e91a525a6043ef6194d311a4c95182120955cc22651e7f59a9fb5b2aee21",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:beedc2ca8afb05dfd9031c7fcf0418bb9ca5f582a3402fe41fcc66d005f3147b",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:23b25bd19a0ec54d28b5c2548b93764c625a7fe84d58d2cf61dc074d15f7440b",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0e9f90f9be88cb2895b51507ba8a701e45a04a83908861b85431065acd97b8e",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96f8f681c0317474a172dc7ec31e1a6ed7a3c9c723ffb43854fd5f8a3fbe5090"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9bea7219adaad37dd0241a58c92e51df3673feae2f3e9f0b7268dd1237f92d7"
   }
 }

assets/release/release-x86_64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2026-03-26-041753"
+    "base": "4.18.0-0.nightly-2026-04-05-174132"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2e5e4648284f34f6ec40997d0af1bcab8567db5ab3108df0f396f8c1c1909121",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc254f8c6d85b3dff9adb89b86466814fafc4078bcb0ce1d776d677da3930606",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:621768538ff374a19752920b9dbc2354d92eceaebedd5b6ddb5f79ef640f07cc",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d7678f785f62a9559d4bb55d5bda97f1880cd1fb7a4d263307db0283c9b576b",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f2d097255808c5071d907a42e0cd3542996659d43b29e94a73a7e6952532bb0",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bed96edc5aa9978814c5f20f33d3871e33648c510c912ad10e63bbda3fe474d6",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4d0cf06ce2fbb5cfc1023c4ed6cd69b5c36ef0b586a339d4ba4674d12722afc",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f2faaa3c1681425e8047d96b488e866321dc4d6d9eb8a24fa27a3348971123c",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d6d8f6bb993a30ea17feb2c8a9bacd5e91ebb2950586c876feee38146cc9b66",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffe69dcbfeb82dd28ac878de75a98d8631ba069514171de6bc36d2295df3f72c",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f397655a3ccee89cb91d4835f30df3d19b1a041f901ffbc26fc651ce41f0818",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b5f89494053ae4d26c4a0f1d79dac68edb17c2c178098160dac5ddbe90eb6d1",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83b34e6d8cacdd496f75b8d735e9458513e8167aa8a7fbf66c498c8e82cc55e9",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9afbafc298714afd4dca43577b7b030315b7406229dcd295d98791c756b7efc3",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e91dc34228d0f7415ff67c13a869b59088d6976a07b05d95cd56d91cfef9ab7a"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf5803efe5536eb1df495d4167fde3d7f6a26cfb98aa9191b08f1c214228644f"
   }
 }

packaging/crio.conf.d/10-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:bed96edc5aa9978814c5f20f33d3871e33648c510c912ad10e63bbda3fe474d6"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83b34e6d8cacdd496f75b8d735e9458513e8167aa8a7fbf66c498c8e82cc55e9"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"

packaging/crio.conf.d/10-microshift_arm64.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:c69b32e13ec1078af67b8ca94328f47fc8660e7aba8247638d8ee487a43f9e1e"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:23b25bd19a0ec54d28b5c2548b93764c625a7fe84d58d2cf61dc074d15f7440b"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"

scripts/auto-rebase/changelog.txt

@@ -0,0 +1,3 @@
+- operator-framework-olm embedded-component 5cd473d377523ab5746804171dac03e4ae37993f to 4680ec1ee00e1af34e29ec598ac983bf74d2e523
+  - 42b9d713 2026-03-31T00:26:23+00:00 Fix nil pointer dereference in sortUnpackJobs when sorting non-failed jobs (#3793)
+

scripts/auto-rebase/commits.txt

@@ -14,7 +14,7 @@ https://github.com/openshift/kubernetes embedded-component 91c24081f468e7636c824
 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 815b43b7f7288da76dd314553e113aefe2a5897d
 https://github.com/openshift/machine-config-operator embedded-component 7d117b24b0419a2297f4f087d52b12a72cc89c88
 https://github.com/openshift/openshift-controller-manager embedded-component 8ee744063ed12b249f1a2b89e9af4f53b2f1daf7
-https://github.com/openshift/operator-framework-olm embedded-component 5cd473d377523ab5746804171dac03e4ae37993f
+https://github.com/openshift/operator-framework-olm embedded-component 4680ec1ee00e1af34e29ec598ac983bf74d2e523
 https://github.com/openshift/route-controller-manager embedded-component ce6ffa24dac3a5f49f70818e1159e40eaf27a6a3
 https://github.com/openshift/service-ca-operator embedded-component 30efb529a5b7db5d6f352f6ac0470d8385268539
 https://github.com/openshift/oc image-amd64 3a48fc2998a051a77a97cc3393b5d189c22635e0

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.18.0-0.nightly-2026-03-26-041753" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-04-01-232144"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2026-04-05-174132" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-04-05-230919"