diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 21ccf5cf3c..9d2eab1191 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-arm64-2026-05-06-154902 +OCP_VERSION := 4.21.0-0.nightly-arm64-2026-05-10-224416 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 73c759c957..ec698a142b 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-2026-05-06-025300 +OCP_VERSION := 4.21.0-0.nightly-2026-05-10-152311 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index 6b4bcacaa8..ff9e4e7332 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2026-05-06-154902" + "base": "4.21.0-0.nightly-arm64-2026-05-10-224416" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b6c9c2bae557f96c8b388229bc18c485c617df7c148c91ef916f0bc358954af", diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index cf007391eb..7ac95579c7 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-06-025300" + "base": "4.21.0-0.nightly-2026-05-10-152311" }, "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 340c22f190..e6ccfdcaf5 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/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:d05f51f18474e52b95c9b8c86c000c547df98b49fe55e10a427a2c67411a63d1 + digest: sha256:d2321881401d3191ccbd2e04618115af14cd71b7e5359589882509b9851dc505 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:9c47fb0f07237365c9241586b966f371e2b1c5f7e68e7ff9f489465e3b203e78 + digest: sha256:1e3c44139d8c4ef71db1f4650e04ee922908501acde6cb18eaf81c2a4ea9be0d - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:1a372a8f9286d74a98a69e0e15820becfd71bdd4f1d3930011fb508b41588cda @@ -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:9c47fb0f07237365c9241586b966f371e2b1c5f7e68e7ff9f489465e3b203e78 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e3c44139d8c4ef71db1f4650e04ee922908501acde6cb18eaf81c2a4ea9be0d - 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:d05f51f18474e52b95c9b8c86c000c547df98b49fe55e10a427a2c67411a63d1 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2321881401d3191ccbd2e04618115af14cd71b7e5359589882509b9851dc505 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index bcfe12cda8..8ce7b42540 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.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:319267f98683ac64036ab3783830e41879a64397378612fae0f9bcd283b2c70d + digest: sha256:ad9581e60117b1494d0398046f0ea05aea726cac5459fddf38a565cd4b15ba43 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:3068cc228d3597e68de801774e5c35e2d359b9ce97413fc8af7de46f992d7ea4 + digest: sha256:69e47ee0c6174e04fff6a8616d13a475f4638a537a1af8016f401a4572961dcd - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:731316e9d5192651ed8706d614a00dc3cb02dc2c42a208ee2c9ba8426509d329 @@ -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:3068cc228d3597e68de801774e5c35e2d359b9ce97413fc8af7de46f992d7ea4 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69e47ee0c6174e04fff6a8616d13a475f4638a537a1af8016f401a4572961dcd - 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:319267f98683ac64036ab3783830e41879a64397378612fae0f9bcd283b2c70d + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad9581e60117b1494d0398046f0ea05aea726cac5459fddf38a565cd4b15ba43 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 13e9fcb21e..783daaebeb 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-06-154902" + "base": "4.21.0-0.nightly-arm64-2026-05-10-224416" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d05f51f18474e52b95c9b8c86c000c547df98b49fe55e10a427a2c67411a63d1", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c47fb0f07237365c9241586b966f371e2b1c5f7e68e7ff9f489465e3b203e78", + "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" } } 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 8277e7aa61..ea51222bf4 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.21.0-0.nightly-2026-05-06-025300" + "base": "4.21.0-0.nightly-2026-05-10-152311" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:319267f98683ac64036ab3783830e41879a64397378612fae0f9bcd283b2c70d", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3068cc228d3597e68de801774e5c35e2d359b9ce97413fc8af7de46f992d7ea4", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad9581e60117b1494d0398046f0ea05aea726cac5459fddf38a565cd4b15ba43", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69e47ee0c6174e04fff6a8616d13a475f4638a537a1af8016f401a4572961dcd", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:731316e9d5192651ed8706d614a00dc3cb02dc2c42a208ee2c9ba8426509d329" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 7aa0ec46c6..03869a5e0a 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2026-05-06-154902" + "base": "4.21.0-0.nightly-arm64-2026-05-10-224416" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:826dfc57c377acc63c2346713c8e692615528772e4e527eb8cfe6301b8bd4417", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index cf787f0eed..9e9c346b74 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-06-025300" + "base": "4.21.0-0.nightly-2026-05-10-152311" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50b833978643e8bf0e011b3dd34dbb2fd6699fae6717cd6a67f93e1273c3e33f", diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 6373acdc18..a3dbc174b0 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,9 @@ -- machine-config-operator embedded-component a2e5802f1b4d6e80a855c0995ba568fca6fe0546 to c178c8299d40c259699e326f180d9d9bba1130b0 - - 5af67504 2026-05-01T18:12:13Z chore: update AMIs +- 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/commits.txt b/scripts/auto-rebase/commits.txt index 93ab7cb32d..7e73751b53 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -12,9 +12,9 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 9098db0 https://github.com/openshift/etcd embedded-component 806f690e1f140e0aea2eb05ef5f288b756b62895 https://github.com/openshift/kubernetes embedded-component ae1604b0cb7cc72e353d0b8311c6d62c34143661 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component ce5ff17e9a81ce754567e6dd5053d13409c251e9 -https://github.com/openshift/machine-config-operator embedded-component c178c8299d40c259699e326f180d9d9bba1130b0 +https://github.com/openshift/machine-config-operator embedded-component 66a56d4b66a1f36655a5726a0b60e9bfff538db2 https://github.com/openshift/openshift-controller-manager embedded-component 438d52e79d691e016d66eabfe9a53c84229db40c -https://github.com/openshift/operator-framework-olm embedded-component d7462e05f60c0ad13a2dce6ea516cbc624cae203 +https://github.com/openshift/operator-framework-olm embedded-component bed9d823d441b1722e023f9f7f9b2cd56f79e2b2 https://github.com/openshift/route-controller-manager embedded-component 559b7122d1a0cad4ff475b496c2896b39eed8c08 https://github.com/openshift/service-ca-operator embedded-component e9622ba18c86bf24aceab0c19fdcb87339c14f44 https://github.com/openshift/oc image-amd64 9d9df34c46c9deba8c291a2a084de5724c0bd820 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index c8be501ab8..5c82f7b477 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-06-025300" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2026-05-06-154902" +./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"