NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2026-03-25-052622_amd64-2026-03-25_arm64-2026-03-26

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.18.0-0.nightly-arm64-2026-03-22-143827
+OCP_VERSION := 4.18.0-0.nightly-arm64-2026-03-26-022314

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 4.18.0-0.nightly-2026-03-22-143825
+OCP_VERSION := 4.18.0-0.nightly-2026-03-25-052622

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:b98aa5db9e7c90671e41a698e157dac875e540db8dba0f220536977fe0fbc0ac
+    digest: sha256:3154adca875c07f1c78aebde551e4cd30b5a22bc794be8341a7350f9c08f4924
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:d6786a4168c4cc40f9d8b5f4b99e25f4a9c2f1e9abe78472451ba15b2bd0aa93
+    digest: sha256:b65badb70e8d189f81af96782174707f64cf1cb41867654dc3812b7fa554c1e6

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:6402acf81b8588988b08d30c9fe35eadd15c46ee343f12f2f7071fa5d693f5a3
+    digest: sha256:7d3fb12c06d836f670823aa5d9851f9064ad5504ff28dabd6c7d4fd580b26a3e
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:3add1f66188850645d5fe187708dfb2b0bef84057f049b38ee4b731731d29d52
+    digest: sha256:b5f2899d84420d8a96f80560e619f7aeaee99f9abe99a7e922b78b342ec063ce

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2026-03-22-143827"
+    "base": "4.18.0-0.nightly-arm64-2026-03-26-022314"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b98aa5db9e7c90671e41a698e157dac875e540db8dba0f220536977fe0fbc0ac",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6786a4168c4cc40f9d8b5f4b99e25f4a9c2f1e9abe78472451ba15b2bd0aa93"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3154adca875c07f1c78aebde551e4cd30b5a22bc794be8341a7350f9c08f4924",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b65badb70e8d189f81af96782174707f64cf1cb41867654dc3812b7fa554c1e6"
   }
 }

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2026-03-22-143825"
+    "base": "4.18.0-0.nightly-2026-03-25-052622"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6402acf81b8588988b08d30c9fe35eadd15c46ee343f12f2f7071fa5d693f5a3",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3add1f66188850645d5fe187708dfb2b0bef84057f049b38ee4b731731d29d52"
+    "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"
   }
 }

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:bea3943ddb284bf26bca4efbb14fdb64f8d4ea55cb05a0f90399b6bb9b7b1377
+    digest: sha256:0fe083e95171c51bf13720767245bffe531b481b08c5480c4f35ef3575f80916
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:2dd2393e62640efd08bacb7eef62edcb003bb98690d15dc8a9282f7921d83965
+    digest: sha256:33701740afe34bcae619631013556b671e32dd89f29b9c270fb5cf0dcb05774c
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:93b6236ab89c220e20180de55319db390e9376dd30a39bfe5a4928ae45bfed26
+    digest: sha256:3609843d7e1b12631bbcdc697004ff8c5e92b36bf1e89c6d8c8460f42164557c
 
 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:2dd2393e62640efd08bacb7eef62edcb003bb98690d15dc8a9282f7921d83965
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33701740afe34bcae619631013556b671e32dd89f29b9c270fb5cf0dcb05774c
      - 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:bea3943ddb284bf26bca4efbb14fdb64f8d4ea55cb05a0f90399b6bb9b7b1377
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0fe083e95171c51bf13720767245bffe531b481b08c5480c4f35ef3575f80916
     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:6e2fb8cdddb30e4c35b60ce906dd58793e3be56d3c1975e6fa4333697f8300d0
+    digest: sha256:5754b2059fb61bd4bdc00fead0104c99de724995258d2cd6075ad3458c7aa065
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:c930a5f01cfbfbb05fe5f10a68e8e14b9c54718ac30c7e76ad63d5f37d903b1f
+    digest: sha256:a253b6919f6a2de18fbaeecd4c94985787503c3dcfb7e55533841af83fba6f3b
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:ac3f0154ec888931b1010766e5932a5c911586ed3a985cd2d2738551468d822a
+    digest: sha256:3d7678f785f62a9559d4bb55d5bda97f1880cd1fb7a4d263307db0283c9b576b
 
 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:c930a5f01cfbfbb05fe5f10a68e8e14b9c54718ac30c7e76ad63d5f37d903b1f
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a253b6919f6a2de18fbaeecd4c94985787503c3dcfb7e55533841af83fba6f3b
      - 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:6e2fb8cdddb30e4c35b60ce906dd58793e3be56d3c1975e6fa4333697f8300d0
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5754b2059fb61bd4bdc00fead0104c99de724995258d2cd6075ad3458c7aa065
     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-03-22-143827"
+    "base": "4.18.0-0.nightly-arm64-2026-03-26-022314"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bea3943ddb284bf26bca4efbb14fdb64f8d4ea55cb05a0f90399b6bb9b7b1377",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2dd2393e62640efd08bacb7eef62edcb003bb98690d15dc8a9282f7921d83965",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:93b6236ab89c220e20180de55319db390e9376dd30a39bfe5a4928ae45bfed26"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0fe083e95171c51bf13720767245bffe531b481b08c5480c4f35ef3575f80916",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33701740afe34bcae619631013556b671e32dd89f29b9c270fb5cf0dcb05774c",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3609843d7e1b12631bbcdc697004ff8c5e92b36bf1e89c6d8c8460f42164557c"
   }
 }

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2026-03-22-143825"
+    "base": "4.18.0-0.nightly-2026-03-25-052622"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e2fb8cdddb30e4c35b60ce906dd58793e3be56d3c1975e6fa4333697f8300d0",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c930a5f01cfbfbb05fe5f10a68e8e14b9c54718ac30c7e76ad63d5f37d903b1f",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac3f0154ec888931b1010766e5932a5c911586ed3a985cd2d2738551468d822a"
+    "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"
   }
 }

assets/release/release-aarch64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2026-03-22-143827"
+    "base": "4.18.0-0.nightly-arm64-2026-03-26-022314"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac86b99bf304fa267d6f05b80d4acd80d7a77005ae8cd2df6fef06be4e8f6819",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:740aa2f7c29acafc1e92139a819d776e1f4d2925e7d833db3f5bcbdbb9668a26",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:526d28da9cbcee276e786431446798f3e099dd9c5e71a8a51967350b0c6a64e7",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:93b6236ab89c220e20180de55319db390e9376dd30a39bfe5a4928ae45bfed26",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a5c1b72aa7e424ff4f977c0f0baecfe70c5bc80519eb2f4fd2e8f8ab85cf172",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:54e2cf930d901f3c74ffd72912be931b7080f0065b1107e2971d28eb85f6e53c",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2a87edddac7856df68b6fb7fb6dac1314a8eaee2ef06724b4911312149a84ca2",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:36dd8ba6020dd58575ab8dc5631bc9c4d12c0c7817f38227307503cd5765b12d",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:816629fe9b468ce683132ed7a64e1b913fe1fa58ae67772a52c85da7efe741bc",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b71584eb813e96677b45a4143a1c64769a7b002f3d30c514e0d057e0669d2cbe",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3609843d7e1b12631bbcdc697004ff8c5e92b36bf1e89c6d8c8460f42164557c",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03963563aca3d8270d881712a13e28f634b022a4605dd58947913e3879f058a4",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:098e15ecf3a97c97c0fb68db87dc30495567a8b7cf71485ac4bf66f008399f4b",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56299a6e0cc4a302e09687d623c5c02e332799c395235d07edc988b34660b8bf",
     "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:7bf04f6138ca1a176c3d6773abb2e5046f10f2bb6bc88a12f25aca9ba3cc3842"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7114a31a3fdd8b5721309dd5641d04e55bc72481507c5b002b53fa32ccfdced7"
   }
 }

assets/release/release-x86_64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2026-03-22-143825"
+    "base": "4.18.0-0.nightly-2026-03-25-052622"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:153bdf80a3238006106e2454f046225eb44dfe3e23e3c07e3c6dc3d56f890da9",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:abf970887e342b94876d6665eb04c8ceee910fb55c9397aab7e9fb89ed8fb897",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7eeed065eb6bd53bc56250371e4c5271b6cafb231ff1bbd13380e7c96b2aa79",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac3f0154ec888931b1010766e5932a5c911586ed3a985cd2d2738551468d822a",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ee0a227756da28d6fa7b0c02cda24167f8876698c39c5f273289266c19537365",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:459e79ed23926955a297fab111e57e390e1efb8998bf52832e4b85ef178d955d",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d0659cadd6fc1e2de09f7dc11f8f9774e20d00eaa15bb7919154d1448c28fd3",
+    "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:9bb7b938e47bb3d710d4577aa3ac8fcd07aa5957b9c18f559db6f830f477c708",
     "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:4651aeb57f73a4bfe983dc13bfa0010e688beca930de5290f58cb3b84da11851"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e91dc34228d0f7415ff67c13a869b59088d6976a07b05d95cd56d91cfef9ab7a"
   }
 }

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:459e79ed23926955a297fab111e57e390e1efb8998bf52832e4b85ef178d955d"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bed96edc5aa9978814c5f20f33d3871e33648c510c912ad10e63bbda3fe474d6"
 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:54e2cf930d901f3c74ffd72912be931b7080f0065b1107e2971d28eb85f6e53c"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:098e15ecf3a97c97c0fb68db87dc30495567a8b7cf71485ac4bf66f008399f4b"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"

scripts/auto-rebase/changelog.txt

@@ -1,7 +0,0 @@
-- kubernetes-kube-storage-version-migrator embedded-component c0f1886ab08d8c2ed84c9ea648b3f65cd82dc5f5 to 815b43b7f7288da76dd314553e113aefe2a5897d
-  - 524a88e 2026-02-24T16:46:06+01:00 UPSTREAM: <carry>: fix /vendor for hermetic 4.18
-
-- machine-config-operator embedded-component a72592f88e91c86ba00f14d5e104f9d3fbacb81a to ddf9a058799932c22942bdbef849178a6321c883
-  - dd559ec9 2026-03-11T11:25:59-04:00 helpers: compute systemdUnits that added and changed between Ign configs update: only write added or updated systemd units unless forcefile exists then rewrite all systemd units on_disk_validation: check if systemd units in config enabled correctly tests: update MCN condition transition test to account for quick transitions through 'Unknown' state (cherry picked from commit 4512ec46f7b13a6e85588bbf480c4d029990724a)
-  - 858deafe 2025-10-03T07:06:05+00:00 OCPBUGS-60805: configure-ovs: work around a Cisco switch issue
-

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-22-143825" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-03-22-143827"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2026-03-25-052622" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-03-26-022314"