diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 8ce9d6494d..6849bd7aa8 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-arm64-2025-11-07-202937 +OCP_VERSION := 4.19.0-0.nightly-arm64-2025-11-12-222217 diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index d3d819b4be..74ab510833 100644 --- a/assets/components/multus/kustomization.aarch64.yaml +++ b/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:2768d5d182d08323801b1a636387ebdf4a9d77454b1312133bf88bff1dc00b85 + digest: sha256:1829abbd6b31bc2bb7adf41afabaad9cd71b63e322b816b3659e74bab278f2fb - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:1de0049ab332b5c397c11475ada7e8ff1cbce467b9abf9f97e4ccdac84060c3c + digest: sha256:e4246e8e00fb77b2b8e71008c93be3d9c444bd4fcc1ded7aef68aef2f8c8a925 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index 4c1a40ecf4..6355d0415d 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2025-11-07-202937" + "base": "4.19.0-0.nightly-arm64-2025-11-12-222217" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2768d5d182d08323801b1a636387ebdf4a9d77454b1312133bf88bff1dc00b85", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1de0049ab332b5c397c11475ada7e8ff1cbce467b9abf9f97e4ccdac84060c3c" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1829abbd6b31bc2bb7adf41afabaad9cd71b63e322b816b3659e74bab278f2fb", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e4246e8e00fb77b2b8e71008c93be3d9c444bd4fcc1ded7aef68aef2f8c8a925" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index dbaaed6d80..37d9eb2740 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:17d15866346538bf03a6e6e33c38f142d2fbe7559d27b89cc89eadfc7d28deb3 + digest: sha256:d9e712f7d90ceb9d59ae813148a2f0a1b438a96739239d76cdbc946fa119d774 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:4c1e92e8acf9bf5a56ae5008e8838d7ff04b6292009ac2159e366a1d9b0c077e + digest: sha256:41eb9f5ec3a8e0f04a731956c406db94fb9079a77ec4522c2a92f5d28338c19f - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:7c2cebdcbb724ba731c4cbad6d78c41e5d2f4f665e740f653bdf9e0671ff06a6 + digest: sha256:f3c1def42e8b00fbe47afa9a318db518a7bc4092da5cf0956c02c8f46b435e01 patches: - patch: |- @@ -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:4c1e92e8acf9bf5a56ae5008e8838d7ff04b6292009ac2159e366a1d9b0c077e + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41eb9f5ec3a8e0f04a731956c406db94fb9079a77ec4522c2a92f5d28338c19f - 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:17d15866346538bf03a6e6e33c38f142d2fbe7559d27b89cc89eadfc7d28deb3 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9e712f7d90ceb9d59ae813148a2f0a1b438a96739239d76cdbc946fa119d774 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index dd7f5c09d8..032e9f6974 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2025-11-07-202937" + "base": "4.19.0-0.nightly-arm64-2025-11-12-222217" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17d15866346538bf03a6e6e33c38f142d2fbe7559d27b89cc89eadfc7d28deb3", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c1e92e8acf9bf5a56ae5008e8838d7ff04b6292009ac2159e366a1d9b0c077e", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c2cebdcbb724ba731c4cbad6d78c41e5d2f4f665e740f653bdf9e0671ff06a6" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9e712f7d90ceb9d59ae813148a2f0a1b438a96739239d76cdbc946fa119d774", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41eb9f5ec3a8e0f04a731956c406db94fb9079a77ec4522c2a92f5d28338c19f", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3c1def42e8b00fbe47afa9a318db518a7bc4092da5cf0956c02c8f46b435e01" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 2efb472959..1695cd6620 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2025-11-07-202937" + "base": "4.19.0-0.nightly-arm64-2025-11-12-222217" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c92feafd8bb2a842d2a5f689b83d511511e64018d9b774789abcbd5ba7ab9b5", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:23f27d2c894a030bb6ec00ee8bc6e4edcbc24d3e87e30d07b28f909e6db820f0", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e7ffee0e43d955a3ecd3f2479dc362163a80414a27c324e31c129ac046dea2a", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c2cebdcbb724ba731c4cbad6d78c41e5d2f4f665e740f653bdf9e0671ff06a6", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f91e4b3306f528b9427ed958da6fb3b8f39082320cd1cafd5165ee2a9c5c5081", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b1d0a13a9205445a8e197175571284f0e0dd4c82a800537f57a19d12f307362", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:349cc999e868857b02df98befaebd8d7b6e3b15b7fb1b05ce219fe1758bd8239", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:700b3381828b35bb07de62a611740ac4d37f34336e88de183c44133fa247bad1", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e73a1f6efc9567a32c33dd211f2647a93a24598585eb29de4a3fe6ce4e23d233", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c4fe09f77cef7ef7cd867a815adfad255b6f739905256aba214656e5fbff5126", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3c1def42e8b00fbe47afa9a318db518a7bc4092da5cf0956c02c8f46b435e01", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a67e036238e2b55a056e17ab1b35eaef065ac18b04ab8ce4970a18ad3e8a7b5a", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b78449e08c4b59039176c2780a3383bd29cd4fd1f16dec2c1c9be7f24a5830b5", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4adad683530b45bc5c39a9b1e6faa685792373f1f40611a9136832d0676fa5c0", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:03771d66c0ed8a422c012ffaf6f390d8c3191e02330ef9b9dee00af518928d6e", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:020707d183e5eb0ef2339528cc2db317c82b92336ea76cc166d6a2903278dc37" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2be91be39aa455617ea8e63278df52ca10e9018470b718434208523181655932" } } diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index 81fdee0ff7..3e66576200 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/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:3b1d0a13a9205445a8e197175571284f0e0dd4c82a800537f57a19d12f307362" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b78449e08c4b59039176c2780a3383bd29cd4fd1f16dec2c1c9be7f24a5830b5" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 07661893ea..5c78f92aa3 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,20 +1,3 @@ -- ovn-kubernetes image-amd64 6c9428e481149bce786ee2ab3f8342d43f950030 to ece958397ed4368e14c711f7e2df4d504bdf53cc - - d687b252 2025-11-04T16:19:32+00:00 Reintroduce completed pod check in shouldReleaseDeletedPod - - 8a31820f 2025-11-04T16:19:32+00:00 kubevirt: test with per-pod SNATs - - 14b97fe3 2025-11-04T16:19:32+00:00 kubevirt: test OVN DB after completion of source pod - - c2d4e502 2025-11-04T16:19:32+00:00 kubevirt: fix search of colliding pods for migrated pods - - 26a2114f 2025-11-04T16:19:32+00:00 kubevirt: prevent error log on IP release - - 48c117a0 2025-11-04T16:19:32+00:00 kubevirt: fix bad release of IPs of live migratable pods - - 1011a33f 2025-11-04T16:19:32+00:00 kubevirt e2e: use a value for vm nodeselector - - 16b7e676 2025-11-04T16:19:32+00:00 Fix naming of "Secondary" to be "User-Defined" - -- ovn-kubernetes image-arm64 6c9428e481149bce786ee2ab3f8342d43f950030 to ece958397ed4368e14c711f7e2df4d504bdf53cc - - d687b252 2025-11-04T16:19:32+00:00 Reintroduce completed pod check in shouldReleaseDeletedPod - - 8a31820f 2025-11-04T16:19:32+00:00 kubevirt: test with per-pod SNATs - - 14b97fe3 2025-11-04T16:19:32+00:00 kubevirt: test OVN DB after completion of source pod - - c2d4e502 2025-11-04T16:19:32+00:00 kubevirt: fix search of colliding pods for migrated pods - - 26a2114f 2025-11-04T16:19:32+00:00 kubevirt: prevent error log on IP release - - 48c117a0 2025-11-04T16:19:32+00:00 kubevirt: fix bad release of IPs of live migratable pods - - 1011a33f 2025-11-04T16:19:32+00:00 kubevirt e2e: use a value for vm nodeselector - - 16b7e676 2025-11-04T16:19:32+00:00 Fix naming of "Secondary" to be "User-Defined" +- kubernetes image-arm64 f94ad893331edbc7eaab8d919339984a497695aa to b67dfb0bd2ce5bc18e84bab0d0fd54b0de21644f + - 1261f40ad 2025-11-10T19:23:03-08:00 UPSTREAM: 133227: Concurrentmap Iteration diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index ec57d59f7a..33c81e1359 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -31,5 +31,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 580c6960cd665d https://github.com/openshift/router image-arm64 b41f9d05467fb7b3f6c2dafa6ac4b5e25164c0b6 https://github.com/openshift/kube-rbac-proxy image-arm64 591277560f328601273f88f2881e09ccccd90a97 https://github.com/openshift/ovn-kubernetes image-arm64 ece958397ed4368e14c711f7e2df4d504bdf53cc -https://github.com/openshift/kubernetes image-arm64 f94ad893331edbc7eaab8d919339984a497695aa +https://github.com/openshift/kubernetes image-arm64 b67dfb0bd2ce5bc18e84bab0d0fd54b0de21644f https://github.com/openshift/service-ca-operator image-arm64 4dfa6916f984d0fd7188380edc88b250738f07f7 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index dd538f9578..636513bf37 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/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.19.0-0.nightly-2025-11-07-214657" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-11-07-202937" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-11-07-214657" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-11-12-222217"