NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-07-23-105013_amd64-2025-07-23_arm64-2025-07-24

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.18.0-0.nightly-arm64-2025-07-16-110136
+OCP_VERSION := 4.18.0-0.nightly-arm64-2025-07-24-004708

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 4.18.0-0.nightly-2025-07-16-110135
+OCP_VERSION := 4.18.0-0.nightly-2025-07-23-105013

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:be84e3b6e852ead249e5e2408e117e524c0e79c0d3cfe43c76990c6fdba08b99
+    digest: sha256:aa257645327d11b79f576c6cd0519ab9725d25cf9f54c1877ddaa0055ad141e7
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:de83af5706eb857b6f404486f973768c38e00815a9a5fd75968d166bf3a7d75d
+    digest: sha256:1338fcbf77ecee35df0ca668590aae366fe19043e9cfe5b36b3af50c15e85e70

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:1109090ebe36287360064786279731940b4f398193da21a16dddbb22663bf8dd
+    digest: sha256:008537b0707e0f3694bf25149bab806dfab047bf0438d5e238667ca19cc453c2
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:2617a7b8d90c4e6ed1b3608bd1d23e8103bcf0003e8ce76362bde734a50c4893
+    digest: sha256:c9a1e8454cba77bb2c047580f09d71d36b2e2e33edff995ef59c58a37c0be641

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2025-07-16-110136"
+    "base": "4.18.0-0.nightly-arm64-2025-07-24-004708"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be84e3b6e852ead249e5e2408e117e524c0e79c0d3cfe43c76990c6fdba08b99",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:de83af5706eb857b6f404486f973768c38e00815a9a5fd75968d166bf3a7d75d"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa257645327d11b79f576c6cd0519ab9725d25cf9f54c1877ddaa0055ad141e7",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1338fcbf77ecee35df0ca668590aae366fe19043e9cfe5b36b3af50c15e85e70"
   }
 }

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2025-07-16-110135"
+    "base": "4.18.0-0.nightly-2025-07-23-105013"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1109090ebe36287360064786279731940b4f398193da21a16dddbb22663bf8dd",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2617a7b8d90c4e6ed1b3608bd1d23e8103bcf0003e8ce76362bde734a50c4893"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:008537b0707e0f3694bf25149bab806dfab047bf0438d5e238667ca19cc453c2",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9a1e8454cba77bb2c047580f09d71d36b2e2e33edff995ef59c58a37c0be641"
   }
 }

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:a2b39a55fe232526ddf8b198a22473ad2c98c0a3324d70be1aff88631e19c8dd
+    digest: sha256:446b3f76becfed495a711130bda4bfd40b8f73d154e7be1323ad3eb120beb8fa
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:d3c6b7fb5559921916f1c96bb270a674d74e83dd611eb3f988972f944dbc5f0b
+    digest: sha256:a3866ee38271acd1b5026326dfea57c80b0c1a47d3bc935093a9933074178a92
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:f71eda011790ef0bbed4964f56f9ca81f03d47ff5e14910f36ba4500b11de81c
+    digest: sha256:4164f9e1a89fb01b12fe74bed7a4c929cd79de7eb21994a9a3b643475a137e24
 
 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:d3c6b7fb5559921916f1c96bb270a674d74e83dd611eb3f988972f944dbc5f0b
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3866ee38271acd1b5026326dfea57c80b0c1a47d3bc935093a9933074178a92
      - 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:a2b39a55fe232526ddf8b198a22473ad2c98c0a3324d70be1aff88631e19c8dd
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:446b3f76becfed495a711130bda4bfd40b8f73d154e7be1323ad3eb120beb8fa
     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:a49b803304335df42a37f96db613c36ff7b42681fb3b34db39fb63b73b5762ad
+    digest: sha256:2b9c08e7c64373fae83b0cc32c8c5c122eb1fb68048480f9acd4f18b9a5b9d11
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:486b1aec8363ccd356f6828847154d5229a14e0fbe96793b0f946dad6d746ada
+    digest: sha256:898ad97f22691212b3f24d340fc2103161819116cf9e7f31cb0a0c8421a8242f
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:ecf83d82182b1a9754af5df44df2f4945e413cf583c9ebbbad63f9bc47e2e8cd
+    digest: sha256:aacf7c64228bf87c3489986c66a11e4ac3b9f0d74d198b48b40ea0645a105dfb
 
 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:486b1aec8363ccd356f6828847154d5229a14e0fbe96793b0f946dad6d746ada
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:898ad97f22691212b3f24d340fc2103161819116cf9e7f31cb0a0c8421a8242f
      - 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:a49b803304335df42a37f96db613c36ff7b42681fb3b34db39fb63b73b5762ad
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b9c08e7c64373fae83b0cc32c8c5c122eb1fb68048480f9acd4f18b9a5b9d11
     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-2025-07-16-110136"
+    "base": "4.18.0-0.nightly-arm64-2025-07-24-004708"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2b39a55fe232526ddf8b198a22473ad2c98c0a3324d70be1aff88631e19c8dd",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3c6b7fb5559921916f1c96bb270a674d74e83dd611eb3f988972f944dbc5f0b",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f71eda011790ef0bbed4964f56f9ca81f03d47ff5e14910f36ba4500b11de81c"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:446b3f76becfed495a711130bda4bfd40b8f73d154e7be1323ad3eb120beb8fa",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3866ee38271acd1b5026326dfea57c80b0c1a47d3bc935093a9933074178a92",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4164f9e1a89fb01b12fe74bed7a4c929cd79de7eb21994a9a3b643475a137e24"
   }
 }

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2025-07-16-110135"
+    "base": "4.18.0-0.nightly-2025-07-23-105013"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a49b803304335df42a37f96db613c36ff7b42681fb3b34db39fb63b73b5762ad",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:486b1aec8363ccd356f6828847154d5229a14e0fbe96793b0f946dad6d746ada",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ecf83d82182b1a9754af5df44df2f4945e413cf583c9ebbbad63f9bc47e2e8cd"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b9c08e7c64373fae83b0cc32c8c5c122eb1fb68048480f9acd4f18b9a5b9d11",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:898ad97f22691212b3f24d340fc2103161819116cf9e7f31cb0a0c8421a8242f",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aacf7c64228bf87c3489986c66a11e4ac3b9f0d74d198b48b40ea0645a105dfb"
   }
 }

assets/release/release-aarch64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2025-07-16-110136"
+    "base": "4.18.0-0.nightly-arm64-2025-07-24-004708"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fa090dc85d7f26ed0b94005ae3bb0c251218f18f62228e11b58aaeba524eabd1",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b0b1208af31a3e2c2366000c4f7b06c2bbfd413596fcbf8f1dac6673999831e",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:010f7e9d4289c6062da6d28b8bcc9c18deb3a04c7ea7ecc9ae494a80e5f97b27",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f71eda011790ef0bbed4964f56f9ca81f03d47ff5e14910f36ba4500b11de81c",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b533a4357c47503db3c180cf6a7e3b7b5e9d90d532ae49418372072c5a911ed1",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b76cd257ee0effe949593f9830b7283b24fb70113a4dc9ebf2282ef7398bb150",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c8c13f86e87d29e59c82ae9a8f830c5ff9ab2071d6faac60f19ee0493b3876a3",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00f86e726d4474527b88828d28d1295ff451aecb3d3c1f1f95aa1c045e36a702",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09c7cdb844f732fd40780127e5ccd33dd4c5a75d51f2deae227909b3bb8afb82",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:daed112214677c47db9245ea45e2fd8334bed3e3d73b2958acc69e3c64c6d198",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4164f9e1a89fb01b12fe74bed7a4c929cd79de7eb21994a9a3b643475a137e24",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:252119171c76a5214f95dafeb28aa0fee5b7166ffe9249a30b5a3187e6b430e5",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d339cd9c8c0dfc62d4a042886c0cf9b5f463cc2503d2af626d04e7c832e2fe35",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cfc67c6ae1974d2db42d8e221dde26dcc9debcccaa564c364e7596a493060dd3",
     "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:937cd653c9b8f94053b0f03d3467311b1d9713770987b85a24c8c8b41efce742"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d88fc94ebd532e650e010a08bcff65a74b5eb97904100e57e93aabf467095231"
   }
 }

assets/release/release-x86_64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2025-07-16-110135"
+    "base": "4.18.0-0.nightly-2025-07-23-105013"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5fc3350e849c149da779fd20a44c9b1e4a3fbf54d570853c688ec2d73b151d20",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a4744c6e8d88c45ab536be5b5f0ae50d5d17af89e8556ec74b5c942b92579f1",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1aad44581de5468c88f409ddc8597ce6790965867e6ce7448aabd21f87d3e63",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ecf83d82182b1a9754af5df44df2f4945e413cf583c9ebbbad63f9bc47e2e8cd",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9e720348efe1e14475365d31aeef7772620b3116b0e3b83f0f714a8e54689828",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0953af221a946273791efed51b9a1e7c4590e510003cc7f15dc9465f59c8ce3",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5def6fc6c9053175996bc3533493cac3e670ee4f92ba2c3d7c92b3e6998c405a",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e2eb055194e3a7e6cd777d2bf3833883e60dc77a67331b12482d611230af544",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00635f58e89b62a725158b1d56dd7e388d6fb0b0fb89403ff09513a38dbb24d7",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d97cd7ee327ffef2715fa5c5dd02e5a2ca147653dc920482b6a992d7a81adb3b",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aacf7c64228bf87c3489986c66a11e4ac3b9f0d74d198b48b40ea0645a105dfb",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:527abf960a6296365ad38668ce894be291e48281993eeb688a56fe2472e6ac7c",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff43256bdff488bd510061574268a41b664fa00467ae41bcb8636f20138c8ff6",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d6f140c5c2760bf3be8e3973047da258b9a889997a2d086a173ec2d71d25224",
     "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:81370ac82bf024f4196b42a1052641ff8b2eab2f32c54a5c5a3a7f5b4b7fd351"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9c8e3c7a27e9d23f59b76162719e2f141c4f4a6c1e041f56959a53e2319f40a"
   }
 }

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

scripts/auto-rebase/changelog.txt

@@ -0,0 +1,9 @@
+- operator-framework-olm embedded-component 4a26a7efa70c754cae0ccafbd7730daa18afc151 to 583538413e0032f33ce2236e9ea503b85226554e
+  - c7732f01 2025-07-16T20:49:22+00:00 🐛 add catalog-operator control-plane-specific tolerations to unpack jobs (#3606)
+
+- ovn-kubernetes image-amd64 5a7022b60d2de3d368cfeb940e586feaf359172f to 4370f4637ce9adc94d7bd5fd01e587b471ee3284
+  - 82f3ae76 2025-07-21T21:15:39-07:00 Revert "unpin libreswan version"
+
+- ovn-kubernetes image-arm64 5a7022b60d2de3d368cfeb940e586feaf359172f to 4370f4637ce9adc94d7bd5fd01e587b471ee3284
+  - 82f3ae76 2025-07-21T21:15:39-07:00 Revert "unpin libreswan version"
+

scripts/auto-rebase/commits.txt

@@ -14,22 +14,22 @@ https://github.com/openshift/kubernetes embedded-component 817e6dd5e0cb98b70cfc7
 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 8dec42d36f9e26487112aeac870767a5fedb8021
 https://github.com/openshift/machine-config-operator embedded-component a91d9a82cbd8c019986c9ce0ea01e513e6fdd6b1
 https://github.com/openshift/openshift-controller-manager embedded-component c87671821e6b05173e5bdc0aab1f80f29438e192
-https://github.com/openshift/operator-framework-olm embedded-component 4a26a7efa70c754cae0ccafbd7730daa18afc151
+https://github.com/openshift/operator-framework-olm embedded-component 583538413e0032f33ce2236e9ea503b85226554e
 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 4fcb2d07875f05d881ac90af73723db0ae5b1d6e
 https://github.com/openshift/coredns image-amd64 eb75d9b4f41a5ce0258d6f245c6206715ecb283b
 https://github.com/openshift/csi-external-snapshotter image-amd64 838d2484157f076bbb81f1b584898aec6f051c2f
 https://github.com/openshift/router image-amd64 d8058949aaf91dcdea050c58e6a34ef5f6670c67
 https://github.com/openshift/kube-rbac-proxy image-amd64 526498ab32996a0f67a96530ad7173f955e3fbe2
-https://github.com/openshift/ovn-kubernetes image-amd64 5a7022b60d2de3d368cfeb940e586feaf359172f
+https://github.com/openshift/ovn-kubernetes image-amd64 4370f4637ce9adc94d7bd5fd01e587b471ee3284
 https://github.com/openshift/kubernetes image-amd64 817e6dd5e0cb98b70cfc7407e94c2c125e4ce424
 https://github.com/openshift/service-ca-operator image-amd64 30efb529a5b7db5d6f352f6ac0470d8385268539
 https://github.com/openshift/oc image-arm64 4fcb2d07875f05d881ac90af73723db0ae5b1d6e
 https://github.com/openshift/coredns image-arm64 eb75d9b4f41a5ce0258d6f245c6206715ecb283b
 https://github.com/openshift/csi-external-snapshotter image-arm64 838d2484157f076bbb81f1b584898aec6f051c2f
 https://github.com/openshift/router image-arm64 d8058949aaf91dcdea050c58e6a34ef5f6670c67
 https://github.com/openshift/kube-rbac-proxy image-arm64 526498ab32996a0f67a96530ad7173f955e3fbe2
-https://github.com/openshift/ovn-kubernetes image-arm64 5a7022b60d2de3d368cfeb940e586feaf359172f
+https://github.com/openshift/ovn-kubernetes image-arm64 4370f4637ce9adc94d7bd5fd01e587b471ee3284
 https://github.com/openshift/kubernetes image-arm64 817e6dd5e0cb98b70cfc7407e94c2c125e4ce424
 https://github.com/openshift/service-ca-operator image-arm64 30efb529a5b7db5d6f352f6ac0470d8385268539

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-2025-07-16-110135" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-07-16-110136"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-07-23-105013" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-07-24-004708"