Skip to content

NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2026-05-04-230007_amd64-2026-05-04_arm64-2026-05-09 #6639

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 11 commits into from
May 9, 2026
Merged

NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2026-05-04-230007_amd64-2026-05-04_arm64-2026-05-09 #6639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f0dce39
update last_rebase.sh
May 9, 2026
6c26ce2
update changelog
May 9, 2026
a532184
update microshift/go.mod
May 9, 2026
5a91cd9
update microshift/deps
May 9, 2026
77a6dd6
update microshift/vendor
May 9, 2026
49f46c2
update etcd/go.mod
May 9, 2026
82cec84
update etcd/vendor
May 9, 2026
7f859eb
update component images
May 9, 2026
1b0e4c7
update manifests
May 9, 2026
197eea0
update buildfiles
May 9, 2026
b16697a
update kubernetes version in CNCF scripts
May 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions 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.10
KUBE_GIT_COMMIT=2d92ab7b3cb444e41ec6d5edf64dfe3b22d93142
KUBE_GIT_VERSION=v1.33.11
KUBE_GIT_COMMIT=ba5f1e63e12c85b7d61d5de4a3bbde39e54d33b2
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-2026-04-30-001256
OCP_VERSION := 4.20.0-0.nightly-arm64-2026-05-09-164333
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-04-28-011031
OCP_VERSION := 4.20.0-0.nightly-2026-05-04-230007
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:5e99320c62dc1cab238bbcb504466a0b04644ab4f148832ccaa24687b24555a1
digest: sha256:213e976e1fefb757a9573b0bfa34a276bea3150ab2cef170c111db84ac25bd3a
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:e624dd2252ebd35148b9bbd2018fb2cc1c7c43b07371756ceeded8e6f32c9261
digest: sha256:4d8af49dbb3f2c2d6852e15cb4c4344e07fa36c479b2a3a82d2e16d20e9e2d18
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-2026-04-30-001256"
"base": "4.20.0-0.nightly-arm64-2026-05-09-164333"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5e99320c62dc1cab238bbcb504466a0b04644ab4f148832ccaa24687b24555a1",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e624dd2252ebd35148b9bbd2018fb2cc1c7c43b07371756ceeded8e6f32c9261"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:213e976e1fefb757a9573b0bfa34a276bea3150ab2cef170c111db84ac25bd3a",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d8af49dbb3f2c2d6852e15cb4c4344e07fa36c479b2a3a82d2e16d20e9e2d18"
}
}
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.20.0-0.nightly-2026-04-28-011031"
"base": "4.20.0-0.nightly-2026-05-04-230007"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:86ff61069252216629a896befefc597a4782796ee60206d03f493128f4256fac",
Expand Down
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:17493d1ab1770d357786fe92143d2d32ddcccbb9b73194cf79aae7da67ffdc8d
digest: sha256:a7a1a951f644e11f340a22b7a24c1194bd87821af3a57acc7bbabf2c6902957f
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:bf69f718b13254004bcacad741e5ee3e74718864b87685c038dc3c7b068bf6ed
digest: sha256:7178f83a9fb7588a735305271bfb65556a7cc08e73212a484c71e9cfe1dfecb6
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:a066d2e84b375a1211954ddfbd1be855ad76af0d3237029dd9f2779a1cef56e4
digest: sha256:568b630e5db283b174d48d1bb4f192c35b3fefa15a7cd9e4d0c1784598384c8c

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:bf69f718b13254004bcacad741e5ee3e74718864b87685c038dc3c7b068bf6ed
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7178f83a9fb7588a735305271bfb65556a7cc08e73212a484c71e9cfe1dfecb6
- 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:17493d1ab1770d357786fe92143d2d32ddcccbb9b73194cf79aae7da67ffdc8d
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7a1a951f644e11f340a22b7a24c1194bd87821af3a57acc7bbabf2c6902957f
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-2026-04-30-001256"
"base": "4.20.0-0.nightly-arm64-2026-05-09-164333"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17493d1ab1770d357786fe92143d2d32ddcccbb9b73194cf79aae7da67ffdc8d",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf69f718b13254004bcacad741e5ee3e74718864b87685c038dc3c7b068bf6ed",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a066d2e84b375a1211954ddfbd1be855ad76af0d3237029dd9f2779a1cef56e4"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7a1a951f644e11f340a22b7a24c1194bd87821af3a57acc7bbabf2c6902957f",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7178f83a9fb7588a735305271bfb65556a7cc08e73212a484c71e9cfe1dfecb6",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:568b630e5db283b174d48d1bb4f192c35b3fefa15a7cd9e4d0c1784598384c8c"
}
}
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.20.0-0.nightly-2026-04-28-011031"
"base": "4.20.0-0.nightly-2026-05-04-230007"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39bc8ea8c67bec49de42eeec8ea71f9cb12a95e5e130a13c970fc96037872c29",
Expand Down
16 changes: 8 additions & 8 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-2026-04-30-001256"
"base": "4.20.0-0.nightly-arm64-2026-05-09-164333"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6c3196c04d569d09727744241d60d61a7f78f358e44d2cb8fa0bf3bdf389d4b",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78b949cf2dffcdaf5c39a2560218937ae4b70dc1d5f0d1be1f1d477e4a651c54",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:16392ca103f471ab7e65383b67d8be87ec15e1cde496f9e06ed1052d3f9ef268",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5caa446df473a1a3a3fd78ecf43e25e4aad92c5a26e57f5251e8d06f81d00160",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4150d6ed577723f808003995f93aade83a0ed48660c9c7b78a06b331035c99b6",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a066d2e84b375a1211954ddfbd1be855ad76af0d3237029dd9f2779a1cef56e4",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f639df613ad1a8d50569677662e4cbb1f60f2a4a3e59bea4fc58efd9f0bfc80",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ef9645ef3e21db91709305a01d9918423fa19c000f33b803067e0f49163662a",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a90a5139913775b795e21ff832d7549d1cdbb28e46fe04f14323f09b3dc335a2",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:568b630e5db283b174d48d1bb4f192c35b3fefa15a7cd9e4d0c1784598384c8c",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83f34805320beb5e453cb99f3e487efa7675d58e5bc919be892787d6126eded9",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b57f770273bb6c58d19ac5f83b32c2e87c58ad8577737f034868e1e103d4ba1",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:72bedd2f86920df60702f4f00282d53d679165acdfa7f1891c7e09616a08c8b0",
"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:8aa68c28482509289c4ffb9a82b2a7071129e263d0a520932e6d546a64e1bae7"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9b82203fe934e900348b9cbc572c2e63c8958c7eda12a172baafe4189ad36437"
}
}
6 changes: 3 additions & 3 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.20.0-0.nightly-2026-04-28-011031"
"base": "4.20.0-0.nightly-2026-05-04-230007"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:212961da81a346bfd96e95d8b11d481b068c214a0c20285a223403c622d1269f",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b711efb591eddc8d55bd32eadec299b63287b8041093b227d2d31cccc6d8a5a2",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70127236b7114c252014706f3647ca605fe6a6a0918afd8cbbb84672ef91ec7a",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:54d33b9efe0867328de774ed049be40275c0bf8fea65d4ac5b319e99e2374b0f",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e185605155beb23dca2c794448707ad216b39c87768a6839731d58e3e3b80a9a",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0fab495939fa3e4d5fe186fdf4b1049573641d719fe921f3650649123d547bed",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d97eab6973cbbcd603215f721e0f4111474fe33a3bcd5d420e2212979e1886ab",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bec1464677067fa247923c22627dd1b78a61d4b52b7184b755f749f6671ac747",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c40cec7ea0593d6caf267f2ab5549dc6070110fd8663a897b55ca87d5dfadd8",
"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:9d0d44230fd7348facab7daf601dae69cff078ee340d760c9b62ba1718540fec"
Expand Down
2 changes: 1 addition & 1 deletion deps/github.com/openshift/kubernetes/.go-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.24.13
1.25.9
Loading