Skip to content

NO-ISSUE: rebase-release-4.21-4.21.0-0.nightly-2026-09-12-094059_amd64-2026-09-12_arm64-2026-09-14 #7371

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

Open
microshift-rebase-script wants to merge 4 commits into
base: release-4.21
Choose a base branch
from
Open

NO-ISSUE: rebase-release-4.21-4.21.0-0.nightly-2026-09-12-094059_amd64-2026-09-12_arm64-2026-09-14 #7371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2dbe1a0
update last_rebase.sh
Sep 14, 2026
b88848a
update changelog
Sep 14, 2026
d0f01ee
update manifests
Sep 14, 2026
c876adc
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.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.21.0-0.nightly-arm64-2026-09-10-025018
OCP_VERSION := 4.21.0-0.nightly-arm64-2026-09-14-022653
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.21.0-0.nightly-2026-09-09-093432
OCP_VERSION := 4.21.0-0.nightly-2026-09-12-094059
2 changes: 1 addition & 1 deletion assets/components/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.21.0-0.nightly-arm64-2026-09-10-025018"
"base": "4.21.0-0.nightly-arm64-2026-09-14-022653"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4eeb634baefdad3897f2a76fde8781fa83002419ba81decd31155a949c275143",
Expand Down
2 changes: 1 addition & 1 deletion assets/components/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.21.0-0.nightly-2026-09-09-093432"
"base": "4.21.0-0.nightly-2026-09-12-094059"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4961243b92353a3213f1d85b099bf972faae7382779142be5190f16d39945674",
Expand Down
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:97e5d6b650c501ad96db6bbd6ecdacef466a8a2723475dec56c537c391500d15
digest: sha256:9268a5088929715d4175329db974ec0739bcd797ffacb81a9a31e8ae98339ebd
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:9673bbdc98a83c41de915b79c21c283ebb70a536f8753135e9cf35b7f5455e53
digest: sha256:3527c044812ea30eda799aaf719d838369453211996dc6b4800820281b080542
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:eceecde87b67160808a94c084836f032e2189b0c4755f7a599b1c8a7f9bc20d6
Expand All @@ -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:9673bbdc98a83c41de915b79c21c283ebb70a536f8753135e9cf35b7f5455e53
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3527c044812ea30eda799aaf719d838369453211996dc6b4800820281b080542
- 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:97e5d6b650c501ad96db6bbd6ecdacef466a8a2723475dec56c537c391500d15
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9268a5088929715d4175329db974ec0739bcd797ffacb81a9a31e8ae98339ebd
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 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,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:76af759ec0ccf344e99023ca444921f95498e5c25a700b9aa20238641de54a3e
digest: sha256:d87b5fa247b7a106c1e1d2d9ae9e20a397b317af41037a10d21406f47152c9f5
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:e02910fdda5d08dd9837aa6c0066dfb01bce6bbc3b87f0cc4bd0a86059b2f8ff
digest: sha256:6410bf76896a1d02757aaf40d2aaca11b5632dbf6b677149eb0b3b129295257f
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:a2355cd4b9c7de7f92caac08b193a3f09603dc2fe46d941724c006f45e21ca08
Expand All @@ -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:e02910fdda5d08dd9837aa6c0066dfb01bce6bbc3b87f0cc4bd0a86059b2f8ff
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6410bf76896a1d02757aaf40d2aaca11b5632dbf6b677149eb0b3b129295257f
- 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:76af759ec0ccf344e99023ca444921f95498e5c25a700b9aa20238641de54a3e
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d87b5fa247b7a106c1e1d2d9ae9e20a397b317af41037a10d21406f47152c9f5
target:
kind: Deployment
labelSelector: app=catalog-operator
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.21.0-0.nightly-arm64-2026-09-10-025018"
"base": "4.21.0-0.nightly-arm64-2026-09-14-022653"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97e5d6b650c501ad96db6bbd6ecdacef466a8a2723475dec56c537c391500d15",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9673bbdc98a83c41de915b79c21c283ebb70a536f8753135e9cf35b7f5455e53",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9268a5088929715d4175329db974ec0739bcd797ffacb81a9a31e8ae98339ebd",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3527c044812ea30eda799aaf719d838369453211996dc6b4800820281b080542",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eceecde87b67160808a94c084836f032e2189b0c4755f7a599b1c8a7f9bc20d6"
}
}
6 changes: 3 additions & 3 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.21.0-0.nightly-2026-09-09-093432"
"base": "4.21.0-0.nightly-2026-09-12-094059"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76af759ec0ccf344e99023ca444921f95498e5c25a700b9aa20238641de54a3e",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e02910fdda5d08dd9837aa6c0066dfb01bce6bbc3b87f0cc4bd0a86059b2f8ff",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d87b5fa247b7a106c1e1d2d9ae9e20a397b317af41037a10d21406f47152c9f5",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6410bf76896a1d02757aaf40d2aaca11b5632dbf6b677149eb0b3b129295257f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2355cd4b9c7de7f92caac08b193a3f09603dc2fe46d941724c006f45e21ca08"
}
}
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.21.0-0.nightly-arm64-2026-09-10-025018"
"base": "4.21.0-0.nightly-arm64-2026-09-14-022653"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:019bf29aff779591a8859d2cd1395d59b323b5f874ec7aecea730c224e040b5b",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.21.0-0.nightly-2026-09-09-093432"
"base": "4.21.0-0.nightly-2026-09-12-094059"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:36189368c887ec353d95711c33242df75b26ac5207502cf87fb115b40f32a0e6",
Expand Down
11 changes: 4 additions & 7 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
- operator-framework-olm embedded-component 149d553b2057320d761c4d1913098a66787dd09a to dea74354157f010d1c2705f87c88b3724843e90d
- 63307408 2026-08-18T14:59:10+05:30 CVE-2026-53488: bump containerd to v1.7.33
- machine-config-operator embedded-component f08b4678edfbce0d57e8d7dc779bf6aae131f0e8 to 0c32560860e39c44babcc69692782c63119fb331
- cc417faf 2026-09-03T13:17:53Z controller: update message for MachineOSBuildFailed condition

- oc image-amd64 4717c66ce35180eea2efcd759aeec77bdc611375 to d0bf7cc5959bf8408912e5276f2ea9e269ede24d
- 6d3d3faa 2026-08-31T12:07:28+05:30 Replace golang.org/x/net with sustaining fork for CVE-2026-33814 because upstream fix (x/net v0.53.0) requires go 1.25.0

- oc image-arm64 4717c66ce35180eea2efcd759aeec77bdc611375 to d0bf7cc5959bf8408912e5276f2ea9e269ede24d
- 6d3d3faa 2026-08-31T12:07:28+05:30 Replace golang.org/x/net with sustaining fork for CVE-2026-33814 because upstream fix (x/net v0.53.0) requires go 1.25.0
- operator-framework-olm embedded-component dea74354157f010d1c2705f87c88b3724843e90d to e0c18696b033d125090f0af6205ec5cd39eaf9de
- 4c147292 2026-08-31T12:19:49+05:30 OCPBUGS-104152: CVE-2026-33814: Replace golang.org/x/net with github.com/openshift-sustaining/net@v0.50.0-sec.3

4 changes: 2 additions & 2 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 2c14afc
https://github.com/openshift/etcd embedded-component b6dda5413ec33fc88fc9751d98d3b4bd96ea877d
https://github.com/openshift/kubernetes embedded-component 93afd702239e69df4bf4b7e66140455ab8282acd
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component ce5ff17e9a81ce754567e6dd5053d13409c251e9
https://github.com/openshift/machine-config-operator embedded-component f08b4678edfbce0d57e8d7dc779bf6aae131f0e8
https://github.com/openshift/machine-config-operator embedded-component 0c32560860e39c44babcc69692782c63119fb331
https://github.com/openshift/openshift-controller-manager embedded-component 438d52e79d691e016d66eabfe9a53c84229db40c
https://github.com/openshift/operator-framework-olm embedded-component dea74354157f010d1c2705f87c88b3724843e90d
https://github.com/openshift/operator-framework-olm embedded-component e0c18696b033d125090f0af6205ec5cd39eaf9de
https://github.com/openshift/route-controller-manager embedded-component 166a3e96f8151d9e789b3951ae75b03cdede5081
https://github.com/openshift/service-ca-operator embedded-component e9622ba18c86bf24aceab0c19fdcb87339c14f44
https://github.com/openshift/oc image-amd64 d0bf7cc5959bf8408912e5276f2ea9e269ede24d
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.21.0-0.nightly-2026-09-09-093432" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2026-09-10-025018"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.21.0-0.nightly-2026-09-12-094059" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2026-09-14-022653"