Skip to content

NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2026-09-13-232117_amd64-2026-09-13_arm64-2026-07-14 #7370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-ci merged 5 commits into from
Sep 15, 2026
Merged

NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2026-09-13-232117_amd64-2026-09-13_arm64-2026-07-14 #7370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5574762
update last_rebase.sh
Sep 14, 2026
4b5bd38
update changelog
Sep 14, 2026
fca3fc9
update component images
Sep 14, 2026
8a3bd2e
update manifests
Sep 14, 2026
4dc2b6c
update buildfiles
Sep 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.20.0-0.nightly-2026-09-08-130250
OCP_VERSION := 4.20.0-0.nightly-2026-09-13-232117
4 changes: 2 additions & 2 deletions assets/components/multus/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:10726c09ff9b97441d4ffbc7c1276b42d1fef1e42fbaaf82f11ab083e19cd1ca
digest: sha256:d65288c54191cd8b92560a30640d0d90faa4143a901bfe0b768226142e782a83
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:ce73e13a51a6e9c5c60933e57ba1971d902e0a6375b3b923306ce8c61c26de4f
digest: sha256:c298a3dd702a0d049c81ba14ad582d7d1e25195107443025a101208e4fd51e9d
6 changes: 3 additions & 3 deletions assets/components/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.20.0-0.nightly-2026-09-08-130250"
"base": "4.20.0-0.nightly-2026-09-13-232117"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:10726c09ff9b97441d4ffbc7c1276b42d1fef1e42fbaaf82f11ab083e19cd1ca",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce73e13a51a6e9c5c60933e57ba1971d902e0a6375b3b923306ce8c61c26de4f"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d65288c54191cd8b92560a30640d0d90faa4143a901bfe0b768226142e782a83",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c298a3dd702a0d049c81ba14ad582d7d1e25195107443025a101208e4fd51e9d"
}
}
10 changes: 5 additions & 5 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:4f9a7a56ba84df6f67336c445a7cc07127497653463a8f3fe24386fc133ff756
digest: sha256:2b888ebbf7c20615e1e89edf30a56b143bd156dc7813b2661c413cf85790b437
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:ac84ddb4e423b4e33afaa069febef6005f96a5a7fadf39aaadd7ad38118d99c5
digest: sha256:5c955eadefce0f1101e36f3cf3b92b3b226bf2c0a2694d8025a4e3e055cc4a3f
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:cdf91bb8f25af39fd694571f550e95770451c0a394e7f5733bc434398c10aa58
digest: sha256:4c4972f352144af69cdf8f04d0886f1ebc811d89565a70eae1dc5e8635016d36

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac84ddb4e423b4e33afaa069febef6005f96a5a7fadf39aaadd7ad38118d99c5
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c955eadefce0f1101e36f3cf3b92b3b226bf2c0a2694d8025a4e3e055cc4a3f
- 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:4f9a7a56ba84df6f67336c445a7cc07127497653463a8f3fe24386fc133ff756
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b888ebbf7c20615e1e89edf30a56b143bd156dc7813b2661c413cf85790b437
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.20.0-0.nightly-2026-09-08-130250"
"base": "4.20.0-0.nightly-2026-09-13-232117"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f9a7a56ba84df6f67336c445a7cc07127497653463a8f3fe24386fc133ff756",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac84ddb4e423b4e33afaa069febef6005f96a5a7fadf39aaadd7ad38118d99c5",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cdf91bb8f25af39fd694571f550e95770451c0a394e7f5733bc434398c10aa58"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b888ebbf7c20615e1e89edf30a56b143bd156dc7813b2661c413cf85790b437",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c955eadefce0f1101e36f3cf3b92b3b226bf2c0a2694d8025a4e3e055cc4a3f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c4972f352144af69cdf8f04d0886f1ebc811d89565a70eae1dc5e8635016d36"
}
}
18 changes: 9 additions & 9 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.20.0-0.nightly-2026-09-08-130250"
"base": "4.20.0-0.nightly-2026-09-13-232117"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:600f2153fc688368696af3218b9b69ae5e3865771aeba59c81a8d191b31d7567",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bfc9bdb17ced564bceb9f9caacb5ab3ecf2b08a52d681df65468667d3cd37f00",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:293b8ead66bcb1d2a41a690322c87569d57d39dfa5f7a5dedee8af5908b9e100",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cdf91bb8f25af39fd694571f550e95770451c0a394e7f5733bc434398c10aa58",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2e544408737b5d65528ea46e0826201261a7d4b38cfb5ff2cf49772e5d819c7",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:329879b4e7db6deef581e104ce3bdad521f7ee8ce014a39635b705be1f150ca5",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ced05316db52d6ac2a5361a0388c310a2db610be0c625ea599f187b224e0692",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf34947842512de01d3e299e597ad6ee640e9036d0bf064b40dd609d8daa6807",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f333f97cd31e2f09107f783a3ab035573fa869770fd48a4d2fb5c9e4f75324a",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:859f8e5921428b1ed632edecf436d8a45d320bbdad9aff128d4a84b16bce2790",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c4972f352144af69cdf8f04d0886f1ebc811d89565a70eae1dc5e8635016d36",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:696f2ce87388bedc5dc71356d84d46e4f9e7925ae3c294207627a44c2dfe763c",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9c4b779e28258e400562732b851fba6648fb757aa9e9589dcb964a6a0c81010",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e68c11ef881d63749469356fd59743c53b4bdff3a832738ac7c31c1efa51784",
"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:6fad67bb50f6c82210016e51f0e62cf7983b001a31be243f403abe4161013ce1"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:441e41534f8d3e2f61b41c6af102fd8b44e44a09c9a38b797ad33385330aa45c"
}
}
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_amd64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:329879b4e7db6deef581e104ce3bdad521f7ee8ce014a39635b705be1f150ca5"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9c4b779e28258e400562732b851fba6648fb757aa9e9589dcb964a6a0c81010"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
19 changes: 9 additions & 10 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
- kubernetes embedded-component 2df3632e823a813f64218dfc6f5c2e70d28ecdf0 to 4012064c4f97c60a48b036469d20df3bcb2ac328
- fe035f535 2026-09-02T19:34:49Z UPSTREAM: 138981: Cache selinux conflicts
- ccbe36ecc 2026-09-02T19:34:49Z UPSTREAM: 137226: controller/selinuxwarning/cache: Add reverse index
- e1738f129 2026-09-02T19:34:48Z UPSTREAM: 137224: controller/selinuxwarning: Pre-parse SELinux label
- e441f4674 2026-08-11T15:28:28Z UPSTREAM: <carry>: OCPBUGS-105592: backport kubernetes/conformance umbrella suite
- cluster-ingress-operator embedded-component f86aaea4136dfea16e62290bd50ecdd1a8b22b3f to 8e4c40f161d8341d640659ca2779a4294960c183
- f4a01e9 2026-08-31T21:30:13+05:30 OCPBUGS-103824: Replace golang.org/x/net with github.com/openshift-sustaining/net@v0.50.0-sec.3 to address CVE-2026-33814

- kubernetes image-amd64 2df3632e823a813f64218dfc6f5c2e70d28ecdf0 to 4012064c4f97c60a48b036469d20df3bcb2ac328
- fe035f535 2026-09-02T19:34:49Z UPSTREAM: 138981: Cache selinux conflicts
- ccbe36ecc 2026-09-02T19:34:49Z UPSTREAM: 137226: controller/selinuxwarning/cache: Add reverse index
- e1738f129 2026-09-02T19:34:48Z UPSTREAM: 137224: controller/selinuxwarning: Pre-parse SELinux label
- e441f4674 2026-08-11T15:28:28Z UPSTREAM: <carry>: OCPBUGS-105592: backport kubernetes/conformance umbrella suite
- machine-config-operator embedded-component 9bc526090b3b087f1d9eaaea86901a3f95c2c997 to d87a335c2ca5c48ca5aa485754d3548f5ecb42af
- a9e26a82 2026-09-09T14:17:49Z controller: update message for MachineOSBuildFailed condition
- 3792e1ab 2026-09-02T04:00:01Z OCPBUGS-98316: Fix SHA idempotency test in nmstate-configuration.sh

- operator-framework-olm embedded-component 1628e53777871f6c264d41a870cc4ee7248106f2 to e1d090d165aa3e31de614b18da7cf4dd2f6976f6
- a6fec5cc 2026-08-31T13:21:28+05:30 OCPBUGS-103947: CVE-2026-33814: Replace golang.org/x/net with github.com/openshift-sustaining/net@v0.50.0-sec.3
- 2a38ff50 2026-08-18T14:37:17+05:30 CVE-2026-53488: bump containerd to v1.7.33

6 changes: 3 additions & 3 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 f86aaea4136dfea16e62290bd50ecdd1a8b22b3f
https://github.com/openshift/cluster-ingress-operator embedded-component 8e4c40f161d8341d640659ca2779a4294960c183
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component e9accf887ef1182f0a96e3086d54441ba8bcae40
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 438c9dba80ddadeabe9efe4a654297a7b550b2b8
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 84eb8c5a73a730d6d08794e51da9c20013ca4304
Expand All @@ -12,9 +12,9 @@ https://github.com/openshift/csi-external-snapshotter embedded-component d123f36
https://github.com/openshift/etcd embedded-component 05bca97760b1cfa1bcef11c0b1f1a5c4dab19709
https://github.com/openshift/kubernetes embedded-component 4012064c4f97c60a48b036469d20df3bcb2ac328
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 0f8a4eb84ace9b746cf25d51d80dacf34ca5f953
https://github.com/openshift/machine-config-operator embedded-component 9bc526090b3b087f1d9eaaea86901a3f95c2c997
https://github.com/openshift/machine-config-operator embedded-component d87a335c2ca5c48ca5aa485754d3548f5ecb42af
https://github.com/openshift/openshift-controller-manager embedded-component d9e543dd31e981f279c447e4f92f0dac3f665f9e
https://github.com/openshift/operator-framework-olm embedded-component 1628e53777871f6c264d41a870cc4ee7248106f2
https://github.com/openshift/operator-framework-olm embedded-component e1d090d165aa3e31de614b18da7cf4dd2f6976f6
https://github.com/openshift/route-controller-manager embedded-component 1a0229e40e5c569c6c59f6b10c26584bccd084b5
https://github.com/openshift/service-ca-operator embedded-component 37e0c31790b6a954214817974a56c9a699d0cf78
https://github.com/openshift/oc image-amd64 1367d50cf3740bc3a6a68ba6c74f6ad5e3ef7cb7
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-09-08-130250" "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-09-13-232117" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2026-07-14-154502"