diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 9d2eab1191..d0cb1a7ee0 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-arm64-2026-05-10-224416 +OCP_VERSION := 4.21.0-0.nightly-arm64-2026-05-14-020248 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index ec698a142b..46670e77b2 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-2026-05-10-152311 +OCP_VERSION := 4.21.0-0.nightly-2026-05-12-052734 diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index 6a064175ed..7b78a7ca84 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:7b6c9c2bae557f96c8b388229bc18c485c617df7c148c91ef916f0bc358954af + digest: sha256:0ca14546447f767334f4b7926bf17715b22632f5613a495842d8fe1e3ffb6b81 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:a84b30fcdc0ffbb7ba40b2deea1e7d7f38d0029fe2f79dc48ce289e65ef16cda + digest: sha256:034f03da44f02ba7d409641031b57e8bf911d96d4cde54775849ebff3474abea diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index ff9e4e7332..950e0ce26c 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2026-05-10-224416" + "base": "4.21.0-0.nightly-arm64-2026-05-14-020248" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b6c9c2bae557f96c8b388229bc18c485c617df7c148c91ef916f0bc358954af", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a84b30fcdc0ffbb7ba40b2deea1e7d7f38d0029fe2f79dc48ce289e65ef16cda" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0ca14546447f767334f4b7926bf17715b22632f5613a495842d8fe1e3ffb6b81", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:034f03da44f02ba7d409641031b57e8bf911d96d4cde54775849ebff3474abea" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 7ac95579c7..f33efa300c 100644 --- a/assets/components/multus/release-multus-x86_64.json +++ b/assets/components/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-2026-05-10-152311" + "base": "4.21.0-0.nightly-2026-05-12-052734" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0afe04a1d8fd8c07f850ed7b68e0dcc6dc31bae391edd345aa5577f6c29d9dd", diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index e6ccfdcaf5..6934a231a9 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:d2321881401d3191ccbd2e04618115af14cd71b7e5359589882509b9851dc505 + digest: sha256:0c3bb8e888e7ecfd8c4f1dfee95595df4f33794ace4dff74cfed120c0c85b34b - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:1e3c44139d8c4ef71db1f4650e04ee922908501acde6cb18eaf81c2a4ea9be0d + digest: sha256:b6a89887f194794e8d40c519834649ca517b5e2793e1c30009adce3ed1d34096 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:1a372a8f9286d74a98a69e0e15820becfd71bdd4f1d3930011fb508b41588cda + digest: sha256:55b66d73c75d93c3750ff497b8ba33c299b4473e6facbe4bf305efc0ee4ecb4d 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:1e3c44139d8c4ef71db1f4650e04ee922908501acde6cb18eaf81c2a4ea9be0d + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6a89887f194794e8d40c519834649ca517b5e2793e1c30009adce3ed1d34096 - 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:d2321881401d3191ccbd2e04618115af14cd71b7e5359589882509b9851dc505 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c3bb8e888e7ecfd8c4f1dfee95595df4f33794ace4dff74cfed120c0c85b34b 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 783daaebeb..7b9d8c7c75 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.21.0-0.nightly-arm64-2026-05-10-224416" + "base": "4.21.0-0.nightly-arm64-2026-05-14-020248" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2321881401d3191ccbd2e04618115af14cd71b7e5359589882509b9851dc505", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e3c44139d8c4ef71db1f4650e04ee922908501acde6cb18eaf81c2a4ea9be0d", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1a372a8f9286d74a98a69e0e15820becfd71bdd4f1d3930011fb508b41588cda" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c3bb8e888e7ecfd8c4f1dfee95595df4f33794ace4dff74cfed120c0c85b34b", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6a89887f194794e8d40c519834649ca517b5e2793e1c30009adce3ed1d34096", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55b66d73c75d93c3750ff497b8ba33c299b4473e6facbe4bf305efc0ee4ecb4d" } } diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index ea51222bf4..7740d000ef 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-2026-05-10-152311" + "base": "4.21.0-0.nightly-2026-05-12-052734" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad9581e60117b1494d0398046f0ea05aea726cac5459fddf38a565cd4b15ba43", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 03869a5e0a..41b45700e2 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2026-05-10-224416" + "base": "4.21.0-0.nightly-arm64-2026-05-14-020248" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:826dfc57c377acc63c2346713c8e692615528772e4e527eb8cfe6301b8bd4417", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39a0574bd2ed6b102ef7f042571e4f6b0a9814721bc2cf9c527be0d29022421c", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b56494e4f4e46900d02ec8c10e3809c1a525622f636615f0ff506004d5e6689f", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1a372a8f9286d74a98a69e0e15820becfd71bdd4f1d3930011fb508b41588cda", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8430519c770706e6bb117cec413473459fc817efae1d9d52171911a8dfa1b57a", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:581f3224b0a7a3a7bfc7ef41e049bf2c36ee54201f2674da9770d0f63a30c130", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14770757e77d70584bf41847c2073828dc08c33ecc0b14f997994e843d06b537", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55b66d73c75d93c3750ff497b8ba33c299b4473e6facbe4bf305efc0ee4ecb4d", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:683b44cb7a83f8b13dd18c07234c89def6e19fffa055cdf58c0d584bc91b7245", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f2a4eef3b27e80cff8e4e9e7cb16d50d29bbb21d6dd0f1b99bdd9473d0ca162", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9cef58e139dda994caab9a64979c39940ced8730c50939be5959997bf303749", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef7066f365af4c2b97a83f6430d5c8fe9c889771028777b1c9a3898bf8034387", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b036534c11c349129d2833c8d522385bdf79e668af002f5f9237dbf335f48a58", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c88c72905f72e6d80d78040b6e2c2d51f197421a9c8c8fa9b6b0dd5ae38dc953" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f38dfc0ef74c657747dd3940ece713a9dd966b85986679c410aa8d0973f05f0" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 9e9c346b74..b84f92d51e 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-2026-05-10-152311" + "base": "4.21.0-0.nightly-2026-05-12-052734" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50b833978643e8bf0e011b3dd34dbb2fd6699fae6717cd6a67f93e1273c3e33f", diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index 447614e3db..4ecc7ab914 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/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:1f2a4eef3b27e80cff8e4e9e7cb16d50d29bbb21d6dd0f1b99bdd9473d0ca162" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef7066f365af4c2b97a83f6430d5c8fe9c889771028777b1c9a3898bf8034387" 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 a3dbc174b0..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,9 +0,0 @@ -- machine-config-operator embedded-component c178c8299d40c259699e326f180d9d9bba1130b0 to 66a56d4b66a1f36655a5726a0b60e9bfff538db2 - - 65804ea2 2026-05-07T15:46:14-04:00 operator: update admin-ack message link - - db8d40cc 2026-05-06T15:51:40Z OCPBUGS-84218: Fix units rollback if update failure - - 7fc70b56 2026-05-05T00:36:39Z OCPBUGS-83859: Fix encapsulated IGN version - - 50339692 2026-05-04T12:33:03Z OCPBUGS-84332: Fix ssh and password rollbacks - -- operator-framework-olm embedded-component d7462e05f60c0ad13a2dce6ea516cbc624cae203 to bed9d823d441b1722e023f9f7f9b2cd56f79e2b2 - - b1aa933e 2026-05-05T17:18:16+05:30 Bump google.golang.org/grpc to v1.79.3 for CVE-2026-33186 - diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 5c82f7b477..d070cd20ec 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.21.0-0.nightly-2026-05-10-152311" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2026-05-10-224416" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.21.0-0.nightly-2026-05-12-052734" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2026-05-14-020248"