NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2026-04-12-151606_amd64-2026-04-12_arm64-2026-04-12

Makefile.version.aarch64.var

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

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 4.18.0-0.nightly-2026-04-08-133854
+OCP_VERSION := 4.18.0-0.nightly-2026-04-12-151606

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

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

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2026-04-09-013854"
+    "base": "4.18.0-0.nightly-arm64-2026-04-12-232347"
   },
   "images": {
-    "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"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:666b635f57e82a7735c0cfc6b0efe630db2bc61de19f99140e925efe8d6dec10",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:952ad268b8f3adb3e0cf5c97a5a68ffceea43b2c817e956a551c6cf2ab4e67d0"
   }
 }

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

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

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:c62f00fca831aff520c24ede07e49434ee323458a292bc47f236f6c9f1c153da
+    digest: sha256:8431749c5f9a226869e81d844e8e1d4c4eb3a9d65ea0724ce184900b8f0120f5
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:ae131cc145f0aaf04b822da3fdbc05ca4d1a4743993d1bda4be62419377d8afe
+    digest: sha256:45b3d7bcb23fa939cdc3588eab7c1827d64324ef8455764bcc1e2d9fed9dec89
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:24f8687437873faedbd31738a8d1ecd89257821f9605de6478caedddccd7832c
+    digest: sha256:78e6715b278d1e8ff18a12b1adda7f406253fccc0bf86a8b849e2a2bfa49e299
 
 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:ae131cc145f0aaf04b822da3fdbc05ca4d1a4743993d1bda4be62419377d8afe
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45b3d7bcb23fa939cdc3588eab7c1827d64324ef8455764bcc1e2d9fed9dec89
      - 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:c62f00fca831aff520c24ede07e49434ee323458a292bc47f236f6c9f1c153da
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8431749c5f9a226869e81d844e8e1d4c4eb3a9d65ea0724ce184900b8f0120f5
     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:766c2d511c45f8e0ba7bb08fd4010881de48118eb07d3252cc194cfe73cc5c50
+    digest: sha256:1e05a555379ec0108ce2ab5c5bf83c9c0ec3b16150735e631cc0ef44f4ec268d
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:5acd4d054d2733be02c418628ed1dd7286af51feb3f7a7456964865a49f0312b
+    digest: sha256:7aac2a59934f7f1c5cc030e6ee692e36b8aa17e0d9eb9f40d83e7c1224f5f03b
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:6270b6a9ec638820da59f4ea62db6488439dd1ad4234dff7d72c5409e8586103
+    digest: sha256:64800896219cd3c657b06747813308f89e4a4fe49e69eb57e2d6b9d9ae18af72
 
 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:5acd4d054d2733be02c418628ed1dd7286af51feb3f7a7456964865a49f0312b
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7aac2a59934f7f1c5cc030e6ee692e36b8aa17e0d9eb9f40d83e7c1224f5f03b
      - 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:766c2d511c45f8e0ba7bb08fd4010881de48118eb07d3252cc194cfe73cc5c50
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e05a555379ec0108ce2ab5c5bf83c9c0ec3b16150735e631cc0ef44f4ec268d
     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-09-013854"
+    "base": "4.18.0-0.nightly-arm64-2026-04-12-232347"
   },
   "images": {
-    "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"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8431749c5f9a226869e81d844e8e1d4c4eb3a9d65ea0724ce184900b8f0120f5",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45b3d7bcb23fa939cdc3588eab7c1827d64324ef8455764bcc1e2d9fed9dec89",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78e6715b278d1e8ff18a12b1adda7f406253fccc0bf86a8b849e2a2bfa49e299"
   }
 }

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2026-04-08-133854"
+    "base": "4.18.0-0.nightly-2026-04-12-151606"
   },
   "images": {
-    "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"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e05a555379ec0108ce2ab5c5bf83c9c0ec3b16150735e631cc0ef44f4ec268d",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7aac2a59934f7f1c5cc030e6ee692e36b8aa17e0d9eb9f40d83e7c1224f5f03b",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:64800896219cd3c657b06747813308f89e4a4fe49e69eb57e2d6b9d9ae18af72"
   }
 }

assets/release/release-aarch64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2026-04-09-013854"
+    "base": "4.18.0-0.nightly-arm64-2026-04-12-232347"
   },
   "images": {
-    "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",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1f2eb994305706f2f1f565464b445a3fdc717f2eee54050a837edd598079039",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8ab9a7efd746d8ed74ca1dd525db290d8dd915ad756d2b06291b5d6da93ca23",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48441e2f6dfc6e58cfb58bc764b49d37a16ddf29832159e492bd886a1b941ed0",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78e6715b278d1e8ff18a12b1adda7f406253fccc0bf86a8b849e2a2bfa49e299",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e0a6c6177c4bb1d4b4c9dc6ae9b11d33166c3167bb975fb097bdf0b0a224c38",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:46804c63aafd80c378478cba599fc057788b94b3466f969f8a5bd8df1e0148f6",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3905c64fb92099027ea3ff1576e32df1a2fb620639f1ba0b2cd099eff79a4c70",
     "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:5f2e3acc3819410658d173a864fed1ae861f1b4c699c4d59a6e8d3a847894a1e"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6d7ec62981a4d01f3dee4e8ac1b62b9e6e6fffe732a06e6d30033bf24dac52a"
   }
 }

assets/release/release-x86_64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2026-04-08-133854"
+    "base": "4.18.0-0.nightly-2026-04-12-151606"
   },
   "images": {
-    "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",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d878039bc070099a34c33a4d728e01aa7f3de9f85f1b604ca77d9e82e19a945",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:318ba96be2e919f018f675539c41eb4fa9fa6853752c97f87e19fee5993fe6f4",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd2ad2667ad43345f950737678493914100d9077ab70f9ad6d8abd618282e116",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:64800896219cd3c657b06747813308f89e4a4fe49e69eb57e2d6b9d9ae18af72",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c19d987180608233f593eea22df51aa952fd81812443bc18b546dc801b327ee",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:babc5ae30e00c0d7853dc0339daebcc743648e7a12c5833ebcc2026d60f39054",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e9025472c3d64b6cf5fa25addf2a340b56f68ec3144dfa7d52ec9173b5b3594",
     "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:7a5ac95230b21894ca461789fb5f4642f7c8a62e2b1a0b05105a5d19ce1b1335"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73c575b37676f15dea0f2ce72224ed1007ae49e55b7a2d53c074971f5a1698c9"
   }
 }

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

scripts/auto-rebase/changelog.txt

@@ -1,3 +0,0 @@
-- 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/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-08-133854" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-04-09-013854"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2026-04-12-151606" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-04-12-232347"