NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2026-04-08-133854_amd64-2026-04-08_arm64-2026-04-09

Makefile.version.aarch64.var

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

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 4.18.0-0.nightly-2026-04-05-174132
+OCP_VERSION := 4.18.0-0.nightly-2026-04-08-133854

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:6e913673a2d54a73c776d9c590f16318d96208434f36a198935bc55a00911a56
+    digest: sha256:9aad8091db1baa23c3773ed90f4a656bdebd3bfbc86aba9cbf7659ae5b859377
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:074b93632403f5d7d9f8707306f2cfaf3661db864f86b910c3aca0aed6c6be0f
+    digest: sha256:3078f4ee93d823b4ef40bf293ea08e2013c004be4df7ea1e5ce95d8aed94d867

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:acf2bc2a822a8fd18084574f47abdedde48399d5644564cfd2bf904a43b2d2d5
+    digest: sha256:e63d8c611061ebbace022250d0c80baf0048115f83ec1f7cedd91bdd734fe235
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:d8ff68ddaf9b9637aa963f343a94065b1cd7f97d99f6360ecabc90c489d0909a
+    digest: sha256:149626d0a32922e048616c3ccd35414409a056c9571b67d62b3f27c1ef443881

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2026-04-05-230919"
+    "base": "4.18.0-0.nightly-arm64-2026-04-09-013854"
   },
   "images": {
-    "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"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9aad8091db1baa23c3773ed90f4a656bdebd3bfbc86aba9cbf7659ae5b859377",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3078f4ee93d823b4ef40bf293ea08e2013c004be4df7ea1e5ce95d8aed94d867"
   }
 }

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2026-04-05-174132"
+    "base": "4.18.0-0.nightly-2026-04-08-133854"
   },
   "images": {
-    "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"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e63d8c611061ebbace022250d0c80baf0048115f83ec1f7cedd91bdd734fe235",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:149626d0a32922e048616c3ccd35414409a056c9571b67d62b3f27c1ef443881"
   }
 }

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:5ea468fe43f65cae55d2a3111328be750dd14d5f82de569a0c03069908c0425c
+    digest: sha256:c62f00fca831aff520c24ede07e49434ee323458a292bc47f236f6c9f1c153da
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:67b554dbc7e693cd37f174ad18a99e1a95083af7da891668bf20df14f4aaa313
+    digest: sha256:ae131cc145f0aaf04b822da3fdbc05ca4d1a4743993d1bda4be62419377d8afe
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:bb17e91a525a6043ef6194d311a4c95182120955cc22651e7f59a9fb5b2aee21
+    digest: sha256:24f8687437873faedbd31738a8d1ecd89257821f9605de6478caedddccd7832c
 
 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:67b554dbc7e693cd37f174ad18a99e1a95083af7da891668bf20df14f4aaa313
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae131cc145f0aaf04b822da3fdbc05ca4d1a4743993d1bda4be62419377d8afe
      - 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:5ea468fe43f65cae55d2a3111328be750dd14d5f82de569a0c03069908c0425c
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c62f00fca831aff520c24ede07e49434ee323458a292bc47f236f6c9f1c153da
     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:404a839519ea09ab8ee15897cb950b6ad52040e3c001a186284017bfe51c8d93
+    digest: sha256:766c2d511c45f8e0ba7bb08fd4010881de48118eb07d3252cc194cfe73cc5c50
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:527b94d9cbd1e9240b0bd9bc2c5694b1ebcebbbc95e33adffde010bda658b206
+    digest: sha256:5acd4d054d2733be02c418628ed1dd7286af51feb3f7a7456964865a49f0312b
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:4f397655a3ccee89cb91d4835f30df3d19b1a041f901ffbc26fc651ce41f0818
+    digest: sha256:6270b6a9ec638820da59f4ea62db6488439dd1ad4234dff7d72c5409e8586103
 
 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:527b94d9cbd1e9240b0bd9bc2c5694b1ebcebbbc95e33adffde010bda658b206
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5acd4d054d2733be02c418628ed1dd7286af51feb3f7a7456964865a49f0312b
      - 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:404a839519ea09ab8ee15897cb950b6ad52040e3c001a186284017bfe51c8d93
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:766c2d511c45f8e0ba7bb08fd4010881de48118eb07d3252cc194cfe73cc5c50
     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-05-230919"
+    "base": "4.18.0-0.nightly-arm64-2026-04-09-013854"
   },
   "images": {
-    "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"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c62f00fca831aff520c24ede07e49434ee323458a292bc47f236f6c9f1c153da",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae131cc145f0aaf04b822da3fdbc05ca4d1a4743993d1bda4be62419377d8afe",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:24f8687437873faedbd31738a8d1ecd89257821f9605de6478caedddccd7832c"
   }
 }

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2026-04-05-174132"
+    "base": "4.18.0-0.nightly-2026-04-08-133854"
   },
   "images": {
-    "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"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:766c2d511c45f8e0ba7bb08fd4010881de48118eb07d3252cc194cfe73cc5c50",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5acd4d054d2733be02c418628ed1dd7286af51feb3f7a7456964865a49f0312b",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6270b6a9ec638820da59f4ea62db6488439dd1ad4234dff7d72c5409e8586103"
   }
 }

assets/release/release-aarch64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2026-04-05-230919"
+    "base": "4.18.0-0.nightly-arm64-2026-04-09-013854"
   },
   "images": {
-    "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",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5510233a848f32ecd628691b1cf0891b4c1b56068ced1b2e973b6016a46f0783",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9e47a367fcec4681cf1205cf17a000fa15daba53adc86298ef8cd0c493e9b0a1",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fbb836294925938ee9e0430a96567b78a912c6496f987b0cdf34ba50ae27a88",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:24f8687437873faedbd31738a8d1ecd89257821f9605de6478caedddccd7832c",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2fd04dd792ce849b4ba0ce952a5587f8a475d89923612da0d332277f553fe213",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1af7e873a374df9b0006e3269e7be8d2cf558e0fe2a467713f00d47c0ef8913c",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c5a4620b3eebfa2f3eae563c1cd451980bbd9e02fb33212cd321cd98e141df0d",
     "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:a9bea7219adaad37dd0241a58c92e51df3673feae2f3e9f0b7268dd1237f92d7"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f2e3acc3819410658d173a864fed1ae861f1b4c699c4d59a6e8d3a847894a1e"
   }
 }

assets/release/release-x86_64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2026-04-05-174132"
+    "base": "4.18.0-0.nightly-2026-04-08-133854"
   },
   "images": {
-    "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",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d55bb2aa84d1c5db717163b9847ec3c92b450be0c1b223bd227a66297a161ff3",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fde2335e42fd92d4cadf358db4b72259454c10abcd72d65267e95ef7b4d774e9",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f3caddc7a269e18b927194a54ac1e8c73c41e888157919a8986b852b1fd3043",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6270b6a9ec638820da59f4ea62db6488439dd1ad4234dff7d72c5409e8586103",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:348ad5c58f5fcee71709dacff4c544e0d735804bd34336fbd0c90286475687d8",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f9030bc6721f3dbc9225f856da7ceca1ded587084c2c4a8c9ea4bf09737dd2d",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03696295c3e968d3dc3005a7510a12d109f2cf2b766057028f9070ba72bc08b6",
     "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:cf5803efe5536eb1df495d4167fde3d7f6a26cfb98aa9191b08f1c214228644f"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a5ac95230b21894ca461789fb5f4642f7c8a62e2b1a0b05105a5d19ce1b1335"
   }
 }

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:83b34e6d8cacdd496f75b8d735e9458513e8167aa8a7fbf66c498c8e82cc55e9"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f9030bc6721f3dbc9225f856da7ceca1ded587084c2c4a8c9ea4bf09737dd2d"
 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:23b25bd19a0ec54d28b5c2548b93764c625a7fe84d58d2cf61dc074d15f7440b"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1af7e873a374df9b0006e3269e7be8d2cf558e0fe2a467713f00d47c0ef8913c"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"

scripts/auto-rebase/changelog.txt

@@ -1,3 +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)
+- cluster-network-operator embedded-component 8df9d04f3019ff6e0a4c51504601e8a73b4322e3 to c7c587b0d7cc0e9b344291bed5e66dc59e15c74e
+  - a0b2b40 2026-03-19T03:25:31+00:00 Fix: whereabouts-token-watcher DaemonSet improvements
 

scripts/auto-rebase/commits.txt

@@ -5,7 +5,7 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 7ec6093
 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component e9bc90906c726823f154c78d3e568c98ff77b6a5
 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 6347fc8179b2a04d51c99432ae612bf4df595dc0
 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 4e99db62cea1d2ca48765230c6f5663d1f2c2702
-https://github.com/openshift/cluster-network-operator embedded-component 8df9d04f3019ff6e0a4c51504601e8a73b4322e3
+https://github.com/openshift/cluster-network-operator embedded-component c7c587b0d7cc0e9b344291bed5e66dc59e15c74e
 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component f1711cf30f683ec0eaa187cd5168caae9e8c1254
 https://github.com/openshift/cluster-policy-controller embedded-component 5fd852525909ce6eab52972ba9ce8fcf56528eb9
 https://github.com/openshift/csi-external-snapshotter embedded-component 8ddbcd381bf5317c1d1a93db3b5760681a33cb27

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-04-05-174132" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-04-05-230919"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2026-04-08-133854" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-04-09-013854"