NO-ISSUE: rebase-main-4.20.0-0.nightly-2025-08-18-192426_amd64-2025-08-18_arm64-2025-08-26 (#5367)

* update last_rebase.sh

* update changelog

* update component images

* update manifests

* update buildfiles

---------

Co-authored-by: ci-robot <[email protected]>

Author: microshift-rebase-script[bot]

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.20.0-0.nightly-arm64-2025-08-24-220912
+OCP_VERSION := 4.20.0-0.nightly-arm64-2025-08-26-135544

assets/components/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:d35b3b197b1c47146e874376c80fde72f20520410e1116455fb0cdb0d60f0fbf
+    digest: sha256:1cd0128519a4cfb49eb14c54d0f5e3238243cf0145899e9bbcda0f80604f4d1c
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:07e56077a5f010d6be721f47dfc38745a9824e0263776d9bfcba851cafe49997
+    digest: sha256:ec5dec84ef3002179cc10105adb9d35f59644fa688d8d99f50f8b545dbdfb1d9

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-arm64-2025-08-24-220912"
+    "base": "4.20.0-0.nightly-arm64-2025-08-26-135544"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d35b3b197b1c47146e874376c80fde72f20520410e1116455fb0cdb0d60f0fbf",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07e56077a5f010d6be721f47dfc38745a9824e0263776d9bfcba851cafe49997"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1cd0128519a4cfb49eb14c54d0f5e3238243cf0145899e9bbcda0f80604f4d1c",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec5dec84ef3002179cc10105adb9d35f59644fa688d8d99f50f8b545dbdfb1d9"
   }
 }

assets/optional/kube-proxy/kustomization.aarch64.yaml

@@ -2,4 +2,4 @@
 images:
   - name: kube-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:b5219b9dfc01972f986726aad7e9fb6b42142ee5c6c4a0083acb9170fb9e241e
+    digest: sha256:53ab0a569973c44b739b40f9d6420e8f81b68fab162c23cc864e22e67d19206b

assets/optional/kube-proxy/release-kube-proxy-aarch64.json

@@ -1,8 +1,8 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-arm64-2025-08-24-220912"
+    "base": "4.20.0-0.nightly-arm64-2025-08-26-135544"
   },
   "images": {
-    "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5219b9dfc01972f986726aad7e9fb6b42142ee5c6c4a0083acb9170fb9e241e"
+    "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53ab0a569973c44b739b40f9d6420e8f81b68fab162c23cc864e22e67d19206b"
   }
 }

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:4e92da6fa3ec8f86b1adf173c5e0ff6df6b8490c64bcab24c6c99e04a4653cec
+    digest: sha256:57543a0a95115e227273f12d001fe9c90671c56cbe0749b6fb02250ddfe56159
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:c7f64db1642daf3a26ef36db5b967ce1ba6348ad5cfb68d2550f1f888223cd24
+    digest: sha256:6f66d899f28247d64f7885ea450ff8fd4ce04f626b2797e9854640e03b80cf75
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:f4b8fd842d6a5df2c70900f13348ef7ffe3634c85be67ed443e2791f31f51a9a
+    digest: sha256:5ebf8a9ac4f11adc5fce0ea3709d4c7374b288f7075d78bad15b235ed5a14d59
 
 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:c7f64db1642daf3a26ef36db5b967ce1ba6348ad5cfb68d2550f1f888223cd24
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f66d899f28247d64f7885ea450ff8fd4ce04f626b2797e9854640e03b80cf75
      - 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:4e92da6fa3ec8f86b1adf173c5e0ff6df6b8490c64bcab24c6c99e04a4653cec
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57543a0a95115e227273f12d001fe9c90671c56cbe0749b6fb02250ddfe56159
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-arm64-2025-08-24-220912"
+    "base": "4.20.0-0.nightly-arm64-2025-08-26-135544"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e92da6fa3ec8f86b1adf173c5e0ff6df6b8490c64bcab24c6c99e04a4653cec",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7f64db1642daf3a26ef36db5b967ce1ba6348ad5cfb68d2550f1f888223cd24",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4b8fd842d6a5df2c70900f13348ef7ffe3634c85be67ed443e2791f31f51a9a"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57543a0a95115e227273f12d001fe9c90671c56cbe0749b6fb02250ddfe56159",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f66d899f28247d64f7885ea450ff8fd4ce04f626b2797e9854640e03b80cf75",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ebf8a9ac4f11adc5fce0ea3709d4c7374b288f7075d78bad15b235ed5a14d59"
   }
 }

assets/release/release-aarch64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-arm64-2025-08-24-220912"
+    "base": "4.20.0-0.nightly-arm64-2025-08-26-135544"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11f80c958e8de4a123c7dea715c4344fa4a686c23abb04d55409355a1177e010",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7bdec186dfcc4606a65f1f74e1120a2aa68fcd6eb20628cd546761c0ba21f1e0",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:913ddfc614610b2029ee2ad3a9795d21875353ec347e9f3ca54c1a2a5ae30ed1",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e3a7824102c9e28b9e31cc6cb7d5a9430f31bf9baf9f2b3d7173dfafc8d4eaf6",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f150026dfddb021f92eb324edf097ace000fed8fb5fcfc93aaef8c1e6f88293",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4b8fd842d6a5df2c70900f13348ef7ffe3634c85be67ed443e2791f31f51a9a",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ebf8a9ac4f11adc5fce0ea3709d4c7374b288f7075d78bad15b235ed5a14d59",
     "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8809b1f69a0fb28abcd673f128ba7fac160b17c008dac897a1fdc64de873be4a",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6aabe233019afbb4d773e24fbe8ac9488f1d450c5e3423a65542a5f5ba46131",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33cb8e7f8abdf0b57825e54bb32717a25bf315a2af62ee50167db1ec931f9fad",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ba32a330a9e73c9e62e97665a41d4241043df44b3e1a929812777379512207ce",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:36a9b22cd2ea014bb6ed0e210e01cdbdc80e720d15838d944691ee4d4af9b726",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:0689e27defe411a07da33e339ec65df67e09a3a7080b8e5494fae5cb1a35db36",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fb0dc4528e77b8b52847dc905d6195bb6b998de35f83e33d7b75e07e20b075c6"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d7ea7d2f387abdc5fb50166b38b0273ad99b66aa86a4b3099983690f208d6f4d"
   }
 }

packaging/crio.conf.d/10-microshift_arm64.conf

@@ -2,6 +2,6 @@
 # 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:c6aabe233019afbb4d773e24fbe8ac9488f1d450c5e3423a65542a5f5ba46131"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ba32a330a9e73c9e62e97665a41d4241043df44b3e1a929812777379512207ce"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"

scripts/auto-rebase/changelog.txt

@@ -1,14 +0,0 @@
-- kubernetes image-arm64 d45f97b43472dff30de2527eda9f335f75956924 to 42c7d00914adca7b516027fe5a886e9d2bc1e3d6
-  - a0ef218a2 2025-08-14T16:21:53-04:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
-  - 79495022e 2025-08-14T15:11:14-04:00 UPSTREAM: <carry>: Add plugin for storage performant security policy
-  - 74cdb4273 2025-08-13T14:16:42+00:00 Release commit for Kubernetes v1.33.4
-  - 36b3f7603 2025-08-10T14:53:04-07:00 do not allow the node to update it's owner reference
-  - ea042e8d4 2025-08-07T14:39:27+02:00 UPSTREAM: <carry>: Disable tests from featuregates that are not explicitly enabled
-  - 8c49e9612 2025-07-29T12:49:43-07:00 fixes scheduler nil panic due to empty init container request&limit
-  - a2ef871e5 2025-07-28T16:31:06-07:00 remove failing test that depends on expired credential, remove credential, add TODOs
-  - 9cf0b2db7 2025-07-15T18:23:29+00:00 Update CHANGELOG/CHANGELOG-1.33.md for v1.33.3
-  - e7ff6701a 2025-07-11T20:34:49+02:00 Bump dependencies, images and versions used to Go 1.24.5 and distroless iptables
-
-- service-ca-operator image-arm64 355085d721615835a4025fb155a270dc3a2c488c to b0fe556a981964728306f803864af9d2881db967
-  - 12a8fb0 2025-08-21T21:15:33+08:00 Add README to test extension
-