Skip to content

NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-05-18-130120_amd64-2026-05-18_arm64-2026-05-18 #6690

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 10 commits into from
May 19, 2026
Merged

NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-05-18-130120_amd64-2026-05-18_arm64-2026-05-18 #6690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4ed71dc
update last_rebase.sh
May 19, 2026
38defb8
update changelog
May 19, 2026
3e4d871
update microshift/go.mod
May 19, 2026
0d0eb59
update microshift/deps
May 19, 2026
8d864a3
update microshift/vendor
May 19, 2026
2d33d73
update etcd/go.mod
May 19, 2026
c2b9936
update etcd/vendor
May 19, 2026
49e8aab
update component images
May 19, 2026
d557d6e
update manifests
May 19, 2026
1b0235b
update buildfiles
May 19, 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
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=35
KUBE_GIT_VERSION=v1.35.4
KUBE_GIT_COMMIT=6b9ddbe6e09aa225e949baecde4145208bf94c8e
KUBE_GIT_VERSION=v1.35.5
KUBE_GIT_COMMIT=c5ea727d19837f8a22cda5c0ba8899960b7777ff
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.22.0-0.nightly-arm64-2026-05-18-015115
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-05-18-195115
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.22.0-0.nightly-2026-05-13-154759
OCP_VERSION := 4.22.0-0.nightly-2026-05-18-130120
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:05e3dd857008fb90e2e4ccdeb26dfafd39ddcca397283c6f8563bc13192da4cd
digest: sha256:748798f55aed433eef0e451283359084fa1e74adf11cd4d89ee1403774f8fdd3
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:e68c577994350df7d0ff57649f24daaf0e28c8e5b7afadfd5357fe90e8387e39
digest: sha256:3a8acf3de0289a32423b00c259f436684cf06f83e7d933a31857129f507122de
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.22.0-0.nightly-arm64-2026-05-18-015115"
"base": "4.22.0-0.nightly-arm64-2026-05-18-195115"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:655a9d04510059e5a465b9c38875eccd27dd26cfb9ef8bcecd3c4966fe071798",
Expand Down
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.22.0-0.nightly-2026-05-13-154759"
"base": "4.22.0-0.nightly-2026-05-18-130120"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05e3dd857008fb90e2e4ccdeb26dfafd39ddcca397283c6f8563bc13192da4cd",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e68c577994350df7d0ff57649f24daaf0e28c8e5b7afadfd5357fe90e8387e39"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:748798f55aed433eef0e451283359084fa1e74adf11cd4d89ee1403774f8fdd3",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a8acf3de0289a32423b00c259f436684cf06f83e7d933a31857129f507122de"
}
}
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:8f7ffbbc2881ab733a7380b809a7da79885d4ae4786b2d2e72a9184801caddf3
digest: sha256:524b90fabbab585fab59f637700ab445ee08640aee67d714ae1fb2783af2cb3d
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:813b4852e9d4f61ea9557ed27e2fdff2d06edc735e569fcb7cb0417c0e68b7bc
digest: sha256:38163ba23e846b6710480ba348e415d47082b5cd4880926e024c21e30f903eb9
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:28ce4fb536ad0b695620ffcd026ff3284b6aee36821ffce0e291159d7ae78804
digest: sha256:76f1ea773c20eeb9d3e07f98f522854c573c4f285193d643e904fedf0f766614

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:813b4852e9d4f61ea9557ed27e2fdff2d06edc735e569fcb7cb0417c0e68b7bc
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38163ba23e846b6710480ba348e415d47082b5cd4880926e024c21e30f903eb9
- 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:8f7ffbbc2881ab733a7380b809a7da79885d4ae4786b2d2e72a9184801caddf3
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:524b90fabbab585fab59f637700ab445ee08640aee67d714ae1fb2783af2cb3d
target:
kind: Deployment
labelSelector: app=catalog-operator
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.22.0-0.nightly-arm64-2026-05-18-015115"
"base": "4.22.0-0.nightly-arm64-2026-05-18-195115"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:197e653ef871c5df107f7899a64b0575bd33537d053f77ed062679c208d53835",
Expand Down
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.22.0-0.nightly-2026-05-13-154759"
"base": "4.22.0-0.nightly-2026-05-18-130120"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f7ffbbc2881ab733a7380b809a7da79885d4ae4786b2d2e72a9184801caddf3",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:813b4852e9d4f61ea9557ed27e2fdff2d06edc735e569fcb7cb0417c0e68b7bc",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28ce4fb536ad0b695620ffcd026ff3284b6aee36821ffce0e291159d7ae78804"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:524b90fabbab585fab59f637700ab445ee08640aee67d714ae1fb2783af2cb3d",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38163ba23e846b6710480ba348e415d47082b5cd4880926e024c21e30f903eb9",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76f1ea773c20eeb9d3e07f98f522854c573c4f285193d643e904fedf0f766614"
}
}
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.22.0-0.nightly-arm64-2026-05-18-015115"
"base": "4.22.0-0.nightly-arm64-2026-05-18-195115"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88b77851bd769ebeecc9eaa52168e8f995002dcac011e16dfb2c18a44c1c92bc",
Expand Down
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.22.0-0.nightly-2026-05-13-154759"
"base": "4.22.0-0.nightly-2026-05-18-130120"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8762deff566a93d3d6fa9869748f50e22bbadf0e8979898803cc290ef5a91cd0",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25272a0944e00a27ce1d63e2cc1dfba29b896b89890fe191f394f67b6e13ae05",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f11b7a4f6cc23e213a30566cab93ac01d347a49aa40825feab57ba5010a66f6",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28ce4fb536ad0b695620ffcd026ff3284b6aee36821ffce0e291159d7ae78804",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f73f7295fcaf42ab336cd98782f802945dd1fac1771ca48f29bfaf7e1036ce46",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40cf94e00c8e84d6c613e38795d0742bffbec39264acfe450eefd7d26b75c784",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51e4e2a749cfa068c41775652adbcb1ffad0a0264b6121e7590a9406cbc86574",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:570e8cf68b924824188ac24a813c85b845d826d0b84989edfbceb14d78887608",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2f9930d88ba4077266d69229bb21c193386441bb7e3309eb2e6b1a75028c0af",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:06458beb6ba34213c83f5c66fab748b647bbafc9930ce0e322d0e5a1da3867f0",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76f1ea773c20eeb9d3e07f98f522854c573c4f285193d643e904fedf0f766614",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0bfafdd8708d19724c6ec44e84f572f507462e71ceb023433c6cf2265080b8a8",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5958e314edca4fee07140d284af68c62fbbb4ae9379ee0504a1ea1018f04068",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1b4f6ddffd62789e06d4d3e28501ed9b794d2a4eae139944eb6590a09839b861",
"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:02bdca6af3c8aa48ecfe1f24259cb24850e28b1614727e0e6abb7a47732d3237"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88b5ed553911b7180f09027ce1ad5c4e5135bc969bad4c6720dc6ad967337e20"
}
}
Loading