From 321e813eb3ebdacb92cfd7125575d635bb02db63 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 10 Aug 2026 04:25:17 +0000 Subject: [PATCH 1/5] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 15ed9de982..b279ea6453 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.20.0-0.nightly-2026-08-05-084330" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2026-07-14-154502" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.20.0-0.nightly-2026-08-09-080523" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2026-07-14-154502" From aa74715c0c6cb8561b5c0f59f97aa5d4d986043c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 10 Aug 2026 04:25:18 +0000 Subject: [PATCH 2/5] update changelog --- scripts/auto-rebase/changelog.txt | 11 ++++++----- scripts/auto-rebase/commits.txt | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 6330c2d3ff..9dc456fd0a 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,6 +1,7 @@ -- ovn-kubernetes image-amd64 ff75cbd102b3f58445df4116ddcbe4d2ef2d254f to 25ccfc590108a9e734fb68b7991a5d0650af0640 - - 53757642 2026-07-23T15:44:16+02:00 e2e(virt): Replace fake virt-launcher pod with proper VMI in UDPN test - - 1e16523e 2026-07-23T15:38:28+02:00 e2e(virt): Add test with three VMs same hostname - - 236032f5 2026-07-23T15:38:28+02:00 kubevirt: Support handling vm hostname field - - 2fadc6d3 2026-07-23T15:36:19+02:00 kubevirt: skip source LSP re-enable when source pod is not local +- cluster-ingress-operator embedded-component 12a2b5974ae9cbb644b2827af3597a3c911d1d4c to f86aaea4136dfea16e62290bd50ecdd1a8b22b3f + - 6ea1b8e 2026-07-22T16:40:30Z OCPBUGS-77457: Respect proxy configuration on gwapi provisioning + +- machine-config-operator embedded-component 1f1efae7758fd6ec0d9e90cb9a893f51ff1079b8 to 3cfcf6c812e9960a837be8a29a7a328e7ea758d3 + - 1fdcfe98 2026-08-06T11:16:44-04:00 mcc: replace wildcard permissions with explicit verbs and resources in MCC ClusterRole & scope configmap access to target namespace via Role instead of ClusterRole + - 2196b04d 2026-08-06T04:42:40Z chore: update AMIs diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index b9cc95f4c3..f942bdadcd 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,7 +1,7 @@ https://github.com/openshift/api embedded-component 05da40ea98557f8351483a39db3d0e7d9076bc8f https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component a99bd8ffb9aa596fa8d6932d5d93e0613c5d367f https://github.com/openshift/cluster-dns-operator embedded-component 82578923164636746e0d74d594ab32d83a660c0b -https://github.com/openshift/cluster-ingress-operator embedded-component 12a2b5974ae9cbb644b2827af3597a3c911d1d4c +https://github.com/openshift/cluster-ingress-operator embedded-component f86aaea4136dfea16e62290bd50ecdd1a8b22b3f https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 00259384502230d2c5b463dcda8a5c05caf2154e https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 438c9dba80ddadeabe9efe4a654297a7b550b2b8 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 84eb8c5a73a730d6d08794e51da9c20013ca4304 @@ -12,7 +12,7 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 433cf89 https://github.com/openshift/etcd embedded-component 05bca97760b1cfa1bcef11c0b1f1a5c4dab19709 https://github.com/openshift/kubernetes embedded-component 2df3632e823a813f64218dfc6f5c2e70d28ecdf0 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 0f8a4eb84ace9b746cf25d51d80dacf34ca5f953 -https://github.com/openshift/machine-config-operator embedded-component 1f1efae7758fd6ec0d9e90cb9a893f51ff1079b8 +https://github.com/openshift/machine-config-operator embedded-component 3cfcf6c812e9960a837be8a29a7a328e7ea758d3 https://github.com/openshift/openshift-controller-manager embedded-component d9e543dd31e981f279c447e4f92f0dac3f665f9e https://github.com/openshift/operator-framework-olm embedded-component 1628e53777871f6c264d41a870cc4ee7248106f2 https://github.com/openshift/route-controller-manager embedded-component 1a0229e40e5c569c6c59f6b10c26584bccd084b5 From f6a09d12d35ae7516b45d7df8dd0c663947562aa Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 10 Aug 2026 04:27:13 +0000 Subject: [PATCH 3/5] update component images --- packaging/crio.conf.d/10-microshift_amd64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 61a3805cbf..da1750d977 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.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:f20d6c14997049a23cf2a78bb499c4ea44acb805e0fd34f129a98dced38b469c" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9a3d510cb753bc024f6a8e4034e37f0a3859f96fe99eaa232cbdf1b48d98d7d" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 728c0a8a815466bf87279549ddca0caba2907200 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 10 Aug 2026 04:27:15 +0000 Subject: [PATCH 4/5] update manifests --- .../multus/kustomization.x86_64.yaml | 4 ++-- .../multus/release-multus-x86_64.json | 6 +++--- .../kustomization.x86_64.yaml | 10 +++++----- .../release-olm-x86_64.json | 8 ++++---- assets/release/release-x86_64.json | 18 +++++++++--------- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index e430c948bf..e08fb22a1a 100644 --- a/assets/components/multus/kustomization.x86_64.yaml +++ b/assets/components/multus/kustomization.x86_64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:be6752116beb8b9d986479dc94d5fa591c74ac3ec2d40c989c07b72cd0e6dc38 + digest: sha256:6fd6af125821815a0c83bc13eba4272f0d99ab5e5949fa01b3314f08bd80e80e - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:3f6d370c4ea972ad11a2609876d77cd1d9096fa6553b21d0556a85927ddb1fef + digest: sha256:a012aba492a84c969afecedf4738106b070289396c02e88a795c2061ab3bc60b diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 80b02c16f3..53ad4da160 100644 --- a/assets/components/multus/release-multus-x86_64.json +++ b/assets/components/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.20.0-0.nightly-2026-08-05-084330" + "base": "4.20.0-0.nightly-2026-08-09-080523" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be6752116beb8b9d986479dc94d5fa591c74ac3ec2d40c989c07b72cd0e6dc38", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f6d370c4ea972ad11a2609876d77cd1d9096fa6553b21d0556a85927ddb1fef" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fd6af125821815a0c83bc13eba4272f0d99ab5e5949fa01b3314f08bd80e80e", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a012aba492a84c969afecedf4738106b070289396c02e88a795c2061ab3bc60b" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 134b248965..3a4cf12cc8 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.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:5d7716708c2b0341a986b09c9f63647cd79f1b4aa0dc0c33f04643def3159c0f + digest: sha256:58df2fc6f18f8fbde606413ce2bb96a989957c81f95751de902974413709a8df - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:d64f75ecf3194e4df284a262f99c8e2ef4c9e77084e510874377cf5a36a0d3b6 + digest: sha256:18b106916ea78b7c6d26e5ccd6fdae83c195f5a829b04cb6ebceb3df130c4c29 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:2b04d3076f278eb2cd40801ffe2b482b89f10c72f01e3b3100996559574dcc41 + digest: sha256:5f72b426e3eeb2017bde1c6903017d474beab64a174a8c3ffea07f46cb583693 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:d64f75ecf3194e4df284a262f99c8e2ef4c9e77084e510874377cf5a36a0d3b6 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18b106916ea78b7c6d26e5ccd6fdae83c195f5a829b04cb6ebceb3df130c4c29 - 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:5d7716708c2b0341a986b09c9f63647cd79f1b4aa0dc0c33f04643def3159c0f + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:58df2fc6f18f8fbde606413ce2bb96a989957c81f95751de902974413709a8df target: kind: Deployment labelSelector: app=catalog-operator 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 4c19fbac71..be7fdde076 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.20.0-0.nightly-2026-08-05-084330" + "base": "4.20.0-0.nightly-2026-08-09-080523" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d7716708c2b0341a986b09c9f63647cd79f1b4aa0dc0c33f04643def3159c0f", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d64f75ecf3194e4df284a262f99c8e2ef4c9e77084e510874377cf5a36a0d3b6", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b04d3076f278eb2cd40801ffe2b482b89f10c72f01e3b3100996559574dcc41" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:58df2fc6f18f8fbde606413ce2bb96a989957c81f95751de902974413709a8df", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18b106916ea78b7c6d26e5ccd6fdae83c195f5a829b04cb6ebceb3df130c4c29", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f72b426e3eeb2017bde1c6903017d474beab64a174a8c3ffea07f46cb583693" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 48ec2d92b5..88487c1e0b 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.20.0-0.nightly-2026-08-05-084330" + "base": "4.20.0-0.nightly-2026-08-09-080523" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d5f6280bed89c9af8de9a8eba02df9a6be3f7825c8858b1895dfb923f2cfc2bf", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:24be5d0b0f1947bca2baefdb8e167884253fde8e130c95a1cf608660ee76cc1a", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f8786d982ef5ce14b17875d73b3882d273fe059ca03df850443dffbd91d94032", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b04d3076f278eb2cd40801ffe2b482b89f10c72f01e3b3100996559574dcc41", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af0a595e23ea8b9bbc438ead68e279ea110b37e565d7b6228b5468108ae13577", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f20d6c14997049a23cf2a78bb499c4ea44acb805e0fd34f129a98dced38b469c", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f71cd6e1f985147d39fb7cb6a5e75f370cd980344289fd68b7b2d4ac2a5d0dc", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50e41c1d21a2d645a469e3f52f7a3a3ec1543000dfbc08484077d7be69202bc8", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:de408aa27913ab9507393e427cf6592e34f15152e630de1cb56f240f7f32c9c4", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0ae3bbd58db547fce5660a70b8b2e6fe47db11f87ef4f1cbd0d1aa7f500edb9", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f72b426e3eeb2017bde1c6903017d474beab64a174a8c3ffea07f46cb583693", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a0bdd84db7a535aeb6d91283d9762cadd08a926e0494027fbac78b84c6fd6a0", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9a3d510cb753bc024f6a8e4034e37f0a3859f96fe99eaa232cbdf1b48d98d7d", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5502a0d16335cad14cf4bbca9f05143590fcbe6ec4e50e6021c9323347eec18", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:1b811581702794a395aa9d700998ffc2b2a9d722b83237179fbaf14ad783aa40", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8aefa2e28847a73f1439b62b8fbbf76bc3c52e89e7437c083bf15bc3ca8178d1" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52cb3a80cff53e2736a1c03a57a5b6e03841f354224d2fe825fb6505634f7c5c" } } From cc80a184d3b5c70cfbd1781a86f47b1f5b84de48 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 10 Aug 2026 04:27:16 +0000 Subject: [PATCH 5/5] update buildfiles --- Makefile.version.x86_64.var | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index c829a322da..1d622bdfa1 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.20.0-0.nightly-2026-08-05-084330 +OCP_VERSION := 4.20.0-0.nightly-2026-08-09-080523