Skip to content

NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-06-18-194212_amd64-2026-06-18_arm64-2026-06-18 #6906

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 5 commits into
base: release-4.22
Choose a base branch
from
Open

NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-06-18-194212_amd64-2026-06-18_arm64-2026-06-18 #6906

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
36f0d06
update last_rebase.sh
Jun 19, 2026
bb6c833
update changelog
Jun 19, 2026
9c1d057
update component images
Jun 19, 2026
4cf5afb
update manifests
Jun 19, 2026
de5def2
update buildfiles
Jun 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
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-06-11-020307
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-06-18-225435
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-06-10-175716
OCP_VERSION := 4.22.0-0.nightly-2026-06-18-194212
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:26f361907d2c4be91b4e10d0abdd585891dcc475837b18b230c052f6d41cbf71
digest: sha256:7c1967986d7ef3bcd28f86daf460a0de546f9068e61f927202097933b440a6af
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:fe5225deb386ae5d49456b1044808d9661e304952cf93082cc804bca9d20792f
digest: sha256:78204a5a40f1f657f6f47c6f3729b981aa38daa7543fb4c26f53a4093d87f9bf
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:220c2dcadcb8ef4b969e786968ef8142785885f30afb946da5bf1e69233a7996
digest: sha256:dfc9cad1273a420fef72f22a205fe61bf5b3a880291375dece4e400c8b88c320
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:b14080f28e33ba82da7bb8ea2d71e3b77dbe1b6315c3283dfd58c3368c2e60ac
digest: sha256:5d52c3f7f37fc458af60e30754206d4ce94d4bbf3808b682b9c3493928c8ba67
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.22.0-0.nightly-arm64-2026-06-11-020307"
"base": "4.22.0-0.nightly-arm64-2026-06-18-225435"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26f361907d2c4be91b4e10d0abdd585891dcc475837b18b230c052f6d41cbf71",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe5225deb386ae5d49456b1044808d9661e304952cf93082cc804bca9d20792f"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c1967986d7ef3bcd28f86daf460a0de546f9068e61f927202097933b440a6af",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78204a5a40f1f657f6f47c6f3729b981aa38daa7543fb4c26f53a4093d87f9bf"
}
}
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-06-10-175716"
"base": "4.22.0-0.nightly-2026-06-18-194212"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:220c2dcadcb8ef4b969e786968ef8142785885f30afb946da5bf1e69233a7996",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b14080f28e33ba82da7bb8ea2d71e3b77dbe1b6315c3283dfd58c3368c2e60ac"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dfc9cad1273a420fef72f22a205fe61bf5b3a880291375dece4e400c8b88c320",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d52c3f7f37fc458af60e30754206d4ce94d4bbf3808b682b9c3493928c8ba67"
}
}
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:3547b09258daccbf9f0ef46327ab8a704744bcbaca4231b989424aac8bb5199c
digest: sha256:d733617c65b35924cf3f1fca6d3465894f3ba1392373533b5c02f08604e7aaac
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:a46da2f4969f2e5d1179e62fe83cc4a6fed5a146e66e18a052795c06129b31d3
digest: sha256:54e649f76831421b407d8a3544faa8645e7264c3c5c73f99ca8a1db8cded0e05
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:a5fa30fc7f2c6b3a541d1d0514dc208bfa171389018fd91aaf4114914e76a789
digest: sha256:71c6df613ad54620352aaa7875251a48d6eca71f5658f3f0b0f5bcc76a30a2c2

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:a46da2f4969f2e5d1179e62fe83cc4a6fed5a146e66e18a052795c06129b31d3
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:54e649f76831421b407d8a3544faa8645e7264c3c5c73f99ca8a1db8cded0e05
- 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:3547b09258daccbf9f0ef46327ab8a704744bcbaca4231b989424aac8bb5199c
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d733617c65b35924cf3f1fca6d3465894f3ba1392373533b5c02f08604e7aaac
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:7640313815b1017ec9a126041fa4b42f410bdde4021628d2e3ba8b709f3a0d72
digest: sha256:354fc5962ec4f0f586836cb6b23b91a9cf0ae84519c98d8fa887e371a141c502
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:4a910e8ce3f0bdcc330bee31ee8e22a8e012a278b44703a906d88ce75c832d8c
digest: sha256:7b705a6d3d1bccb6d67577188539de95b6d284e4c1bc05d4eac3eadd17a1b25f
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:96a94e57ccff7cac3eba0a3c64ddca0371624f31b025bccab550633969249361
digest: sha256:3b0ed343cd24999a060ded584b03f08df086d66b87dd9a61a55249c62afc5b94

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:4a910e8ce3f0bdcc330bee31ee8e22a8e012a278b44703a906d88ce75c832d8c
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b705a6d3d1bccb6d67577188539de95b6d284e4c1bc05d4eac3eadd17a1b25f
- 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:7640313815b1017ec9a126041fa4b42f410bdde4021628d2e3ba8b709f3a0d72
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:354fc5962ec4f0f586836cb6b23b91a9cf0ae84519c98d8fa887e371a141c502
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.22.0-0.nightly-arm64-2026-06-11-020307"
"base": "4.22.0-0.nightly-arm64-2026-06-18-225435"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3547b09258daccbf9f0ef46327ab8a704744bcbaca4231b989424aac8bb5199c",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a46da2f4969f2e5d1179e62fe83cc4a6fed5a146e66e18a052795c06129b31d3",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5fa30fc7f2c6b3a541d1d0514dc208bfa171389018fd91aaf4114914e76a789"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d733617c65b35924cf3f1fca6d3465894f3ba1392373533b5c02f08604e7aaac",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:54e649f76831421b407d8a3544faa8645e7264c3c5c73f99ca8a1db8cded0e05",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:71c6df613ad54620352aaa7875251a48d6eca71f5658f3f0b0f5bcc76a30a2c2"
}
}
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-06-10-175716"
"base": "4.22.0-0.nightly-2026-06-18-194212"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7640313815b1017ec9a126041fa4b42f410bdde4021628d2e3ba8b709f3a0d72",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a910e8ce3f0bdcc330bee31ee8e22a8e012a278b44703a906d88ce75c832d8c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96a94e57ccff7cac3eba0a3c64ddca0371624f31b025bccab550633969249361"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:354fc5962ec4f0f586836cb6b23b91a9cf0ae84519c98d8fa887e371a141c502",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b705a6d3d1bccb6d67577188539de95b6d284e4c1bc05d4eac3eadd17a1b25f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b0ed343cd24999a060ded584b03f08df086d66b87dd9a61a55249c62afc5b94"
}
}
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.22.0-0.nightly-arm64-2026-06-11-020307"
"base": "4.22.0-0.nightly-arm64-2026-06-18-225435"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62ed750d570bf8a8d7db3e07c37805fcd5969be4670d801300f9a1b19c373a05",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87d5ff02c8c9be3cb73adf3c3523371faf89fa93df90c52d3454756c3d7a6ed8",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8378464fac32dded96a09deee06acc533dea6d815ddebea4ee201396d0e5a652",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5fa30fc7f2c6b3a541d1d0514dc208bfa171389018fd91aaf4114914e76a789",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa048997bec5742d6e27fb4e915efa26a76a9d7cf7b6b3cac39577dda792461b",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:baefe33e858052ac8aea4fae9d0a0c7893560a4f3d42c053da69fcc399c0f197",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ad214eb9dff7d70dd550644cd983c1ff13e73144f81b57ff226c2a5469d88b2",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a98976207d70c803d5bef947a212f578d3fb3649e6e0ab49b9e214cb2057001a",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60bb59f95bccc1d38de1c0cf4d19e593ab1649dd9cbf05f97956276cbd7ec172",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ae3bc931748cb94848749854306a330481c35e08969f059001e3102263879bf",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:71c6df613ad54620352aaa7875251a48d6eca71f5658f3f0b0f5bcc76a30a2c2",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97ef8d42d4af47ffee96d9181d3f80d9c01f671ab7467d874688fd3482029837",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ee463548fa539a5dfd990a5966c525d3ab15fd5435b6d6e6ae7a875629366ad7",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5e3b7b55389662331e1162caaf89cb9f485dc13912df03a66503051b3028680",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:e77365e44676fbd8ab9e4ce53f3a406856bbdfef3467c545a7df1197d84477af",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76c751676c1d87a3fb9742f7975cbb9c0bf96429ff3ff94338a606ef8c6b506e"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:82300788ae87a940a8dff121c012b2c3181a72679f9e16fe5d9ed4d119d0ad93"
}
}
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-06-10-175716"
"base": "4.22.0-0.nightly-2026-06-18-194212"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f8b08e39afa2f499c26c7b286274c4a6430db49fbb87e48eaea935c96de23ff",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c5ac3a253cc1e80575f9340f5221edb6b0084f9cf26efea6f582c6e6efd674b4",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:117a9ef195508484c302bb9e03e4e9330f97029ea97eabbe6d00a48fd6640aed",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96a94e57ccff7cac3eba0a3c64ddca0371624f31b025bccab550633969249361",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:871a24d8f4a2da4c8d3d1f1b80d839dcc0a901b00df3bf6fc361f64772b13265",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b3475443fd6e386e1b4819b7d3e1b483d885a36ae3259276ae406e8777f4dc4",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:381e6243dfb2a2014086ba2984bb884ef33e5be85556e1234cdde6b39036a2c3",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0fcc5b8d7991eb74ed9c85aa7b8f52df21beca067f4f12d2f4aa1ae9b6ee25c4",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00938710c3c680c9ae9e2a9bbaaebfc5ef1e1f518ed491e9448f5f27f9e42819",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b96cade71fcbfee9f3ec33e38822473c1445908b575e9a89a9dc25d0261adcf1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b0ed343cd24999a060ded584b03f08df086d66b87dd9a61a55249c62afc5b94",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d1cb705b1d9af3d6a157e8d5b6f7bb04c58413bc14650fb4f855ccb1a60dec23",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3dbf79cc8099a8e1143f212f981d384837fc8460ffd446aa5d127076aa54ea49",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44c16a3d9c78542c6de09650d90ac76a05c94b37ae635fc2082482ec615b7dce",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:10c9ccab4f2857d113b55e12cac29aed0dc97d5a4e29ed2e4ea0f77551ee55f8",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f084ab593c98fe715277524e27c359c9928a69b6e06f2303ed253d3c4f62d95e"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f930b732c35c35042e863e32e820b8f6012d818e1e18eb20f4cf4ab240a2904"
}
}
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:4b3475443fd6e386e1b4819b7d3e1b483d885a36ae3259276ae406e8777f4dc4"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3dbf79cc8099a8e1143f212f981d384837fc8460ffd446aa5d127076aa54ea49"
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:baefe33e858052ac8aea4fae9d0a0c7893560a4f3d42c053da69fcc399c0f197"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ee463548fa539a5dfd990a5966c525d3ab15fd5435b6d6e6ae7a875629366ad7"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
Loading