NO-ISSUE: rebase-main-4.20.0-0.nightly-2025-06-20-214016_amd64-2025-06-20_arm64-2025-06-26 (#5108)

* 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-06-25-065907
+OCP_VERSION := 4.20.0-0.nightly-arm64-2025-06-26-231650

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

@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-arm64-2025-06-25-065907"
+    "base": "4.20.0-0.nightly-arm64-2025-06-26-231650"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dff6b68a409a3e5cdd679d7a26420abd5ecd75027edd17bb2dbcbab489506530",

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:817f8bca1475b5209b4d03dfcd1a12b87575580d4a96897653f6c5a84914fdef
+    digest: sha256:eb3a68321a7e1c65789da0b389a455dd3efd2eb5680953e4dc7bdc06d4b4446c

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

@@ -1,8 +1,8 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-arm64-2025-06-25-065907"
+    "base": "4.20.0-0.nightly-arm64-2025-06-26-231650"
   },
   "images": {
-    "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:817f8bca1475b5209b4d03dfcd1a12b87575580d4a96897653f6c5a84914fdef"
+    "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb3a68321a7e1c65789da0b389a455dd3efd2eb5680953e4dc7bdc06d4b4446c"
   }
 }

assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml

@@ -2,10 +2,10 @@
 images:
   - name: quay.io/operator-framework/olm
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:c2a115e0e886afd174840494837a530b93cedc33f1fca1a3103dbceff8aa526e
+    digest: sha256:6fe3da3ac60585ec10b0b5b6fa2e43be4cb596c79c122cd337eca840d9a306d9
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:381876f11b7fc919d40d4dcb97d957cb882227e3a63ba15e37a96ff071626883
+    digest: sha256:7f68e46d50c19683dba8317f54f36af02e3f570d92da7f2dfd7018ab7732d2c2
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
     digest: sha256:4a7e2af832ae8d07f3feb6e4f304b07a347cdb29d40f84dad3ae930e1f7c2fbb
@@ -16,12 +16,12 @@ patches:
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE 
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:381876f11b7fc919d40d4dcb97d957cb882227e3a63ba15e37a96ff071626883
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f68e46d50c19683dba8317f54f36af02e3f570d92da7f2dfd7018ab7732d2c2
      - 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:c2a115e0e886afd174840494837a530b93cedc33f1fca1a3103dbceff8aa526e
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fe3da3ac60585ec10b0b5b6fa2e43be4cb596c79c122cd337eca840d9a306d9
     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-06-25-065907"
+    "base": "4.20.0-0.nightly-arm64-2025-06-26-231650"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2a115e0e886afd174840494837a530b93cedc33f1fca1a3103dbceff8aa526e",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:381876f11b7fc919d40d4dcb97d957cb882227e3a63ba15e37a96ff071626883",
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fe3da3ac60585ec10b0b5b6fa2e43be4cb596c79c122cd337eca840d9a306d9",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f68e46d50c19683dba8317f54f36af02e3f570d92da7f2dfd7018ab7732d2c2",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a7e2af832ae8d07f3feb6e4f304b07a347cdb29d40f84dad3ae930e1f7c2fbb"
   }
 }

assets/release/release-aarch64.json

@@ -1,14 +1,14 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-arm64-2025-06-25-065907"
+    "base": "4.20.0-0.nightly-arm64-2025-06-26-231650"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c7be2010440b12c9b97acd8b61aad07ead88ce7db9dca85e58f3f8a74f11be1",
     "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11f8cb48ca4d216d1d31d68c2f7818ebe56d70bde501b074e47cc2d0fcbd85dd",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6be35e9a533091498f6df47e571708fb004eb3e972b17146612bf913f0b7369",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a7e2af832ae8d07f3feb6e4f304b07a347cdb29d40f84dad3ae930e1f7c2fbb",
     "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33a2190910dd66ee398c3d89821c93229f6f6851fd0aba619d71e68606c8b74e",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffecb0e8f0bac9ee0aee1f492c190c20d6fcd9c707fbc855d666cb5b0d42ba8a",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdecd60c634ec604458884213ce44c5a6739b1ed67bc6eaa9c012fd14488db30",
     "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e373951a5d133c7e9c53038e3dad2eae68c0d50067c363373a12bbc2980da76",
     "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:2195a06e4d5dbe5c3433e49f02c8588c929d4cc1d21e5765733e03898e231d8f"

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

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

scripts/auto-rebase/changelog.txt

@@ -1,6 +1,3 @@
-- oc image-arm64 d6d8c4b4cbae0c73d2a3f78568136a494cac16a4 to ea5c72052233361761ba371b7c39518d443422be
-  - 305aa891 2025-06-20T01:16:15-04:00 Simplify TarEntryCallback
-
-- kubernetes image-arm64 d92880b14300b76b867a83ec887e280a5b77b52e to 62bb9f355bf8568bf1f70b33de574e27e6b446f2
-  - 25a5bda9d 2025-06-20T10:56:32-04:00 UPSTREAM: <carry>: Update rebase.sh to handle go versions major.minor.patch instead of just major.minor
+- kubernetes image-arm64 62bb9f355bf8568bf1f70b33de574e27e6b446f2 to 02b9b7e65987d5aa4559c318725354713838b5a2
+  - 9b547a64e 2025-06-26T09:35:55-03:00 UPSTREAM: 132502: Fix flake caused by invalid detection of active policies in VAP integration tests
 

scripts/auto-rebase/commits.txt

@@ -31,5 +31,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 1b2240dca48840
 https://github.com/openshift/router image-arm64 b41f9d05467fb7b3f6c2dafa6ac4b5e25164c0b6
 https://github.com/openshift/kube-rbac-proxy image-arm64 bc1ca29e2b6b50f15ece8db3990277276cacff0c
 https://github.com/openshift/ovn-kubernetes image-arm64 31d2803e5f38207bf2137ba2ec15a95cee1d0802
-https://github.com/openshift/kubernetes image-arm64 62bb9f355bf8568bf1f70b33de574e27e6b446f2
+https://github.com/openshift/kubernetes image-arm64 02b9b7e65987d5aa4559c318725354713838b5a2
 https://github.com/openshift/service-ca-operator image-arm64 4dfa6916f984d0fd7188380edc88b250738f07f7