Skip to content

NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2025-11-19-223643_amd64-2025-11-19_arm64-2025-11-20 #5770

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-merge-bot merged 5 commits into from
Nov 20, 2025
Merged

NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2025-11-19-223643_amd64-2025-11-19_arm64-2025-11-20 #5770

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
af6ce0d
update last_rebase.sh
Nov 20, 2025
725b2d2
update changelog
Nov 20, 2025
6f484a6
update component images
Nov 20, 2025
f70c893
update manifests
Nov 20, 2025
16b30d4
update buildfiles
Nov 20, 2025
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.kube_git.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=33
KUBE_GIT_VERSION=v1.33.5
KUBE_GIT_COMMIT=cf396bff09dcb68a96f718b5e0e80b50e874afb5
KUBE_GIT_COMMIT=4c392f99fc20a9a5407d8e640c557a47efc7dae2
KUBE_GIT_TREE_STATE=clean
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.20.0-0.nightly-arm64-2025-11-17-033055
OCP_VERSION := 4.20.0-0.nightly-arm64-2025-11-20-012430
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-2025-11-15-175712
OCP_VERSION := 4.20.0-0.nightly-2025-11-19-223643
4 changes: 2 additions & 2 deletions assets/components/multus/kustomization.aarch64.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:2c9f3befe925a25f6859ce8ea69da2721c9cae8ee5cc0682e42c78ac102f425a
digest: sha256:3ffb717ed3cb11466c8a2226d9b5361525db68099dce2005e08382904430265c
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:cce21af5cdce8e943f962089e1d304dd2d9b573eeff0a8bbbf5f610ed1d90c25
digest: sha256:8c19b3f71d8225934d1d293a137ed395832b127e7d185d7ba98b942445b59da5
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:62ad772322e9350c419a7532c93a2154345ca707c1712332d1bc8d5451cec9e9
digest: sha256:2ef01150ef0bf04da1e2ec60ea38747edc782a53ea88184612563936ecb95ef5
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:036b07d5a4e281b665da2caecd8f14f25ee5f8c797cf1dfe8207d590dd92d922
digest: sha256:2e492eea4f00fa1b4dd10c8470dbac49d3698a2e905aa1678f2cd17c93d7de50
6 changes: 3 additions & 3 deletions assets/components/multus/release-multus-aarch64.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-arm64-2025-11-17-033055"
"base": "4.20.0-0.nightly-arm64-2025-11-20-012430"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c9f3befe925a25f6859ce8ea69da2721c9cae8ee5cc0682e42c78ac102f425a",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cce21af5cdce8e943f962089e1d304dd2d9b573eeff0a8bbbf5f610ed1d90c25"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ffb717ed3cb11466c8a2226d9b5361525db68099dce2005e08382904430265c",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c19b3f71d8225934d1d293a137ed395832b127e7d185d7ba98b942445b59da5"
}
}
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-2025-11-15-175712"
"base": "4.20.0-0.nightly-2025-11-19-223643"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62ad772322e9350c419a7532c93a2154345ca707c1712332d1bc8d5451cec9e9",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:036b07d5a4e281b665da2caecd8f14f25ee5f8c797cf1dfe8207d590dd92d922"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ef01150ef0bf04da1e2ec60ea38747edc782a53ea88184612563936ecb95ef5",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2e492eea4f00fa1b4dd10c8470dbac49d3698a2e905aa1678f2cd17c93d7de50"
}
}
10 changes: 5 additions & 5 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,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:527451a21b1330ced29ac56f5ae1b74df5fbe5732faf22aac59c9699a7f7431c
digest: sha256:b825ec2130445bab9bc59c0a87a65d92137733bbc80f72f68c4a25f627fd0e5a
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:1cfe880c7d7980bdfdec6558858e76770503b20fdd990c32bf2d43d9ef6aa75a
digest: sha256:c52387e0b76b04d728e6016c4793a75c2e64537d2c730f1742b9f5ae32ae3af3
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:2fba135636745ee6928bc95710c91cfe4bdcfe5a2dfc11b1df615bdf5eb5c951
digest: sha256:27f5c4dc3ceac1e46d08f261d1dbe4e96ac3e57c3d6ab720cf7f96ad0ef9fd59

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:1cfe880c7d7980bdfdec6558858e76770503b20fdd990c32bf2d43d9ef6aa75a
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c52387e0b76b04d728e6016c4793a75c2e64537d2c730f1742b9f5ae32ae3af3
- 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:527451a21b1330ced29ac56f5ae1b74df5fbe5732faf22aac59c9699a7f7431c
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b825ec2130445bab9bc59c0a87a65d92137733bbc80f72f68c4a25f627fd0e5a
target:
kind: Deployment
labelSelector: app=catalog-operator
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:89d99bbbd05ee26d798babb0cf0ab7f6b19a75e4ad15c9789604a459f7c54f38
digest: sha256:402863b1fbb1c29e786cecd686b5ae1ff96dd134b6506c525585bd7f43836aa5
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:20795e1af5d056c0925618829c8663404ce84691b5a2f74c25fa84e4e0415416
digest: sha256:ffec944d864f564dc7fabb52fb9a5fdfd6885fcbf3bc2121a784c84458aba97d
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:50bd0534299e20862a56412d2f3e27237c8c2a0971a5b74789355e920f1cf77a
digest: sha256:f13164acac5000249ed5c9fd11ae954e7be937056a80e866612a71cef61b124c

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:20795e1af5d056c0925618829c8663404ce84691b5a2f74c25fa84e4e0415416
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffec944d864f564dc7fabb52fb9a5fdfd6885fcbf3bc2121a784c84458aba97d
- 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:89d99bbbd05ee26d798babb0cf0ab7f6b19a75e4ad15c9789604a459f7c54f38
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:402863b1fbb1c29e786cecd686b5ae1ff96dd134b6506c525585bd7f43836aa5
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 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.20.0-0.nightly-arm64-2025-11-17-033055"
"base": "4.20.0-0.nightly-arm64-2025-11-20-012430"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:527451a21b1330ced29ac56f5ae1b74df5fbe5732faf22aac59c9699a7f7431c",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1cfe880c7d7980bdfdec6558858e76770503b20fdd990c32bf2d43d9ef6aa75a",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2fba135636745ee6928bc95710c91cfe4bdcfe5a2dfc11b1df615bdf5eb5c951"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b825ec2130445bab9bc59c0a87a65d92137733bbc80f72f68c4a25f627fd0e5a",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c52387e0b76b04d728e6016c4793a75c2e64537d2c730f1742b9f5ae32ae3af3",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:27f5c4dc3ceac1e46d08f261d1dbe4e96ac3e57c3d6ab720cf7f96ad0ef9fd59"
}
}
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-2025-11-15-175712"
"base": "4.20.0-0.nightly-2025-11-19-223643"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:89d99bbbd05ee26d798babb0cf0ab7f6b19a75e4ad15c9789604a459f7c54f38",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20795e1af5d056c0925618829c8663404ce84691b5a2f74c25fa84e4e0415416",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50bd0534299e20862a56412d2f3e27237c8c2a0971a5b74789355e920f1cf77a"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:402863b1fbb1c29e786cecd686b5ae1ff96dd134b6506c525585bd7f43836aa5",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffec944d864f564dc7fabb52fb9a5fdfd6885fcbf3bc2121a784c84458aba97d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f13164acac5000249ed5c9fd11ae954e7be937056a80e866612a71cef61b124c"
}
}
18 changes: 9 additions & 9 deletions assets/release/release-aarch64.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-arm64-2025-11-17-033055"
"base": "4.20.0-0.nightly-arm64-2025-11-20-012430"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:16dcabdf4cbebf4a77f0fb2acb32ecb2194624b597b9b3f97c4195479970711a",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d75edfb182da649739a16b0facdbffa3e257f0beaa0ba1a18dde1c960b036259",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7cdd79a41e4122e77459cbf45a2d3a6a2439b984b1cc6dca05d64a499e07f529",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2fba135636745ee6928bc95710c91cfe4bdcfe5a2dfc11b1df615bdf5eb5c951",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae51d770255a488f0f7acba466fdb54c3fb8f23cd1c8b36090bdf3e9364f050e",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c64b1d9e6729413d117b842dce2cea576abb2fa4da3acfb749c260f197aaf2d",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c50c56d9ed378f1d56fdfadbea5ba3c35c9d34a73c74200b0e7b160e6e74a364",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d3bdb5d7be9fd8d97a91231f52aaef08d85bcb0fd19b32efe4d2f0f6ed1b311",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8fe05ff07d6cc1830570829f83386bca466fe5d28eb9a431aa7c89ed3c09b052",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75569027058b4a79dcda7d12517876f9c8e5b456d8cbe9a630ac5c8f2439b20e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:27f5c4dc3ceac1e46d08f261d1dbe4e96ac3e57c3d6ab720cf7f96ad0ef9fd59",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:741cb2e90084b290c0e995ff0a7e8f604a80ff23aec77c983b6b35051795a125",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:270fb8392077c5f0c3b62512788e90dfe34982efd00e2b10864e6394dda287e5",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cfd1a04aac1158eda3602f8968a195c3f0bee9e3d53ccf1024cf43b2acfe6624",
"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:c670b44f4f54a6ba29c8ed36d6446810d3e763007576369d952978817c1084a4"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c843c993fa5ce434bc9114771c8f524f130a54b0adbe4579ce97cd80dd85e03f"
}
}
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-2025-11-15-175712"
"base": "4.20.0-0.nightly-2025-11-19-223643"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:564a108b5a36f7e29cecb88f1a0da0141a433f8ec96085a300a9b09ec8778e62",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53e8cb135e9bfa1252084d31a4373295f5d33ee31d72772e6c1ca33312c8d63e",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a557ae1aca845cb65c22982cf50fe05a9c80332a7b2d591f3bdc1456781c0678",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50bd0534299e20862a56412d2f3e27237c8c2a0971a5b74789355e920f1cf77a",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdbe11fc56900aa849f0433695d6c06435c917717dfeb9fd78239149e0f08080",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c3b1c8cad41f6984b39a9aa94b0073720283a5fb59c0b28f161bd9b419f64469",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e2a309c9c0f9d3185566117b6236e201b294b83cfad1c633ddaf53cc85179f6",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6b80ebd7b42a4c0857e4d452c3c1e24c06bfe4402c83ebc1ce5a4a4bfe1d7fc",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b5e4c57813bd627974e4d93754f9f3bc00615f113b0be4d005e0ce37980f567",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2ba53115137b945001e52f33ef3fca741c875b4b89e8b836a0c664f2b6a52d9",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f13164acac5000249ed5c9fd11ae954e7be937056a80e866612a71cef61b124c",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6bbc23085eb7295b45032ee7610098527cedef780e2583c056650f96a955a0be",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1befb1f3a5052734b33a797d875a85dacd2ccce01c9b694261a8531ef3e216fe",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69c696f24be1244c592067732bb5c1acc34674d32c8c7d9ee53eac65426a87d6",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f2f50c89e1034b8cc11de83528716f554b7dd06e965525f8f356538bdd511909"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f8662102d2b5d4e4993136f3570c9d81859149f574764a5ecb1cfc4a12faaf68"
}
}
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:c3b1c8cad41f6984b39a9aa94b0073720283a5fb59c0b28f161bd9b419f64469"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1befb1f3a5052734b33a797d875a85dacd2ccce01c9b694261a8531ef3e216fe"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_arm64.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:4c64b1d9e6729413d117b842dce2cea576abb2fa4da3acfb749c260f197aaf2d"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:270fb8392077c5f0c3b62512788e90dfe34982efd00e2b10864e6394dda287e5"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
Loading