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

Makefile.version.aarch64.var

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

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 4.18.0-0.nightly-2026-03-25-052622
+OCP_VERSION := 4.18.0-0.nightly-2026-03-26-041753

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

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2026-03-26-022314"
+    "base": "4.18.0-0.nightly-arm64-2026-03-29-232143"
   },
   "images": {
-    "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"
+    "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"
   }
 }

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

@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2026-03-25-052622"
+    "base": "4.18.0-0.nightly-2026-03-26-041753"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d3fb12c06d836f670823aa5d9851f9064ad5504ff28dabd6c7d4fd580b26a3e",

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:0fe083e95171c51bf13720767245bffe531b481b08c5480c4f35ef3575f80916
+    digest: sha256:cec1e663c9b454cb05355c22f1594606692c4e145f35b83c40a723e68c6655e3
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:33701740afe34bcae619631013556b671e32dd89f29b9c270fb5cf0dcb05774c
+    digest: sha256:84351aee4592ae4e007cb5c5ed11722f7464a57c92fcc14bd2e3e57df89cdb30
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:3609843d7e1b12631bbcdc697004ff8c5e92b36bf1e89c6d8c8460f42164557c
+    digest: sha256:929d27000955d2ca2913ba8a380e0311762522a5c1cd6a8ae1790d6f1d7b4e57
 
 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:33701740afe34bcae619631013556b671e32dd89f29b9c270fb5cf0dcb05774c
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84351aee4592ae4e007cb5c5ed11722f7464a57c92fcc14bd2e3e57df89cdb30
      - 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:0fe083e95171c51bf13720767245bffe531b481b08c5480c4f35ef3575f80916
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cec1e663c9b454cb05355c22f1594606692c4e145f35b83c40a723e68c6655e3
     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-26-022314"
+    "base": "4.18.0-0.nightly-arm64-2026-03-29-232143"
   },
   "images": {
-    "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"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cec1e663c9b454cb05355c22f1594606692c4e145f35b83c40a723e68c6655e3",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84351aee4592ae4e007cb5c5ed11722f7464a57c92fcc14bd2e3e57df89cdb30",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:929d27000955d2ca2913ba8a380e0311762522a5c1cd6a8ae1790d6f1d7b4e57"
   }
 }

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

@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2026-03-25-052622"
+    "base": "4.18.0-0.nightly-2026-03-26-041753"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5754b2059fb61bd4bdc00fead0104c99de724995258d2cd6075ad3458c7aa065",

assets/release/release-aarch64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2026-03-26-022314"
+    "base": "4.18.0-0.nightly-arm64-2026-03-29-232143"
   },
   "images": {
-    "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",
+    "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",
     "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:7114a31a3fdd8b5721309dd5641d04e55bc72481507c5b002b53fa32ccfdced7"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96f8f681c0317474a172dc7ec31e1a6ed7a3c9c723ffb43854fd5f8a3fbe5090"
   }
 }

assets/release/release-x86_64.json

@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2026-03-25-052622"
+    "base": "4.18.0-0.nightly-2026-03-26-041753"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2e5e4648284f34f6ec40997d0af1bcab8567db5ab3108df0f396f8c1c1909121",
@@ -9,7 +9,7 @@
     "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",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4d0cf06ce2fbb5cfc1023c4ed6cd69b5c36ef0b586a339d4ba4674d12722afc",
     "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"
   }

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

scripts/auto-rebase/changelog.txt

@@ -0,0 +1,3 @@
+- machine-config-operator embedded-component ddf9a058799932c22942bdbef849178a6321c883 to 7d117b24b0419a2297f4f087d52b12a72cc89c88
+  - f4f819c0 2026-03-25T01:24:44+00:00 create default-timeout-stop dropin
+

scripts/auto-rebase/commits.txt

@@ -12,7 +12,7 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 8ddbcd3
 https://github.com/openshift/etcd embedded-component b5a4f8d079fbb04200251d5a6bc7c56f79d9d1e3
 https://github.com/openshift/kubernetes embedded-component 91c24081f468e7636c824f4f5a2eb68660b81012
 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 815b43b7f7288da76dd314553e113aefe2a5897d
-https://github.com/openshift/machine-config-operator embedded-component ddf9a058799932c22942bdbef849178a6321c883
+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/route-controller-manager embedded-component ce6ffa24dac3a5f49f70818e1159e40eaf27a6a3

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-25-052622" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-03-26-022314"
+./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-03-29-232143"