Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.2
KUBE_GIT_COMMIT=2034d92b4a3a51d42e306ba405fc10a89768ac69
KUBE_GIT_COMMIT=92d1d9845cd139dfad96dc17ddd70bdfccc7614c
KUBE_GIT_TREE_STATE=clean
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-03-18-221724
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-03-23-032344
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.22.0-0.nightly-2026-03-17-033403
OCP_VERSION := 4.22.0-0.nightly-2026-03-19-202824
4 changes: 2 additions & 2 deletions assets/components/multus/kustomization.aarch64.yaml
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:1115b5a0c140dcde82e497609385a2d9882f702f1b34548637c5091b7c43a474
digest: sha256:41321cbcc3ad9afd4c18d8877dc8c1b86a4e16452aba92b0f549b32593229b06
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:200dbfd0661a52059cab048806ba380eb8feb1850fc5634c79fe80025819881c
digest: sha256:e93013927c1dcfc3e160a4fa97a1f59945631d715d4ba000397394453434a518
4 changes: 2 additions & 2 deletions assets/components/multus/kustomization.x86_64.yaml
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:51f90ebc8bc3eb0d031cfc41a3720fffd5d3eaad4a31141bfee675b1f8d567ce
digest: sha256:ad8aa9425ac38322d8451426bc017cee280bac23aacf49f341bacc2adb46afa6
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:11f416d27af7b4c42a7ca5aba11afd5c57a919e8e142e5f4959b0d503dbfa327
digest: sha256:f5097fdb57c1ad82e4fa409096a90495f6b0813fe66aca5ef1d73a048ae92fe0
6 changes: 3 additions & 3 deletions assets/components/multus/release-multus-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.22.0-0.nightly-arm64-2026-03-18-221724"
"base": "4.22.0-0.nightly-arm64-2026-03-23-032344"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1115b5a0c140dcde82e497609385a2d9882f702f1b34548637c5091b7c43a474",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:200dbfd0661a52059cab048806ba380eb8feb1850fc5634c79fe80025819881c"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41321cbcc3ad9afd4c18d8877dc8c1b86a4e16452aba92b0f549b32593229b06",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e93013927c1dcfc3e160a4fa97a1f59945631d715d4ba000397394453434a518"
}
}
6 changes: 3 additions & 3 deletions assets/components/multus/release-multus-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.22.0-0.nightly-2026-03-17-033403"
"base": "4.22.0-0.nightly-2026-03-19-202824"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51f90ebc8bc3eb0d031cfc41a3720fffd5d3eaad4a31141bfee675b1f8d567ce",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11f416d27af7b4c42a7ca5aba11afd5c57a919e8e142e5f4959b0d503dbfa327"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad8aa9425ac38322d8451426bc017cee280bac23aacf49f341bacc2adb46afa6",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5097fdb57c1ad82e4fa409096a90495f6b0813fe66aca5ef1d73a048ae92fe0"
}
}
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:e2860486f8ecbffa0c9dca6bf628fb62a5c03b73dd39633db8731a563db50f33
digest: sha256:868b8bb26533370ea1475cf74bb489107ef5269a4bee97f9e1b05cdcf4a2d337
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:611d43c0335ac507e092622b775dfac8dcebe32707b71ae248e4127154df39fd
digest: sha256:192efdbc3e541e491ec1909c34aecbdc3bfdbebed7948672a0753627797aea48
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:f650bc4ecefe0bd39fd40f7ef72252d48b3ddb6950ffc528dea4cf8b5e980f1b
digest: sha256:ab670bdd8c832e8d63992a4109885230295067177585c86a2db0a441cfe2d0d5

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:611d43c0335ac507e092622b775dfac8dcebe32707b71ae248e4127154df39fd
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:192efdbc3e541e491ec1909c34aecbdc3bfdbebed7948672a0753627797aea48
- 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:e2860486f8ecbffa0c9dca6bf628fb62a5c03b73dd39633db8731a563db50f33
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:868b8bb26533370ea1475cf74bb489107ef5269a4bee97f9e1b05cdcf4a2d337
target:
kind: Deployment
labelSelector: app=catalog-operator
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:5b34abc69ec49feba6e614d7d7feaa2d5ff17b59b07e7325ca7e24ef4d428aef
digest: sha256:168022f069daf0ebe11f642bf3886bfc255b43be2ebe57fa3ac8d0276cc3c32f
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:ef54378224d5e92827f940b12961282b11e84917cc7d56f2becf08781fa20245
digest: sha256:b038a60a53d0a1a187a09f22bc9b82d7227789d5f6dd7863cffc58053d36ac7f
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:198863a1d295199013dbaf0d58077027af91abecf2af32968f7103368a0d2785
digest: sha256:3a42312885710e41bc42b1cd8a59281a05f20f3334eec0879708bfdd0adf06f5

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:ef54378224d5e92827f940b12961282b11e84917cc7d56f2becf08781fa20245
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b038a60a53d0a1a187a09f22bc9b82d7227789d5f6dd7863cffc58053d36ac7f
- 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:5b34abc69ec49feba6e614d7d7feaa2d5ff17b59b07e7325ca7e24ef4d428aef
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:168022f069daf0ebe11f642bf3886bfc255b43be2ebe57fa3ac8d0276cc3c32f
target:
kind: Deployment
labelSelector: app=catalog-operator
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.22.0-0.nightly-arm64-2026-03-18-221724"
"base": "4.22.0-0.nightly-arm64-2026-03-23-032344"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2860486f8ecbffa0c9dca6bf628fb62a5c03b73dd39633db8731a563db50f33",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:611d43c0335ac507e092622b775dfac8dcebe32707b71ae248e4127154df39fd",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f650bc4ecefe0bd39fd40f7ef72252d48b3ddb6950ffc528dea4cf8b5e980f1b"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:868b8bb26533370ea1475cf74bb489107ef5269a4bee97f9e1b05cdcf4a2d337",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:192efdbc3e541e491ec1909c34aecbdc3bfdbebed7948672a0753627797aea48",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ab670bdd8c832e8d63992a4109885230295067177585c86a2db0a441cfe2d0d5"
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.22.0-0.nightly-2026-03-17-033403"
"base": "4.22.0-0.nightly-2026-03-19-202824"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b34abc69ec49feba6e614d7d7feaa2d5ff17b59b07e7325ca7e24ef4d428aef",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef54378224d5e92827f940b12961282b11e84917cc7d56f2becf08781fa20245",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:198863a1d295199013dbaf0d58077027af91abecf2af32968f7103368a0d2785"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:168022f069daf0ebe11f642bf3886bfc255b43be2ebe57fa3ac8d0276cc3c32f",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b038a60a53d0a1a187a09f22bc9b82d7227789d5f6dd7863cffc58053d36ac7f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a42312885710e41bc42b1cd8a59281a05f20f3334eec0879708bfdd0adf06f5"
}
}
18 changes: 9 additions & 9 deletions assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.22.0-0.nightly-arm64-2026-03-18-221724"
"base": "4.22.0-0.nightly-arm64-2026-03-23-032344"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:047e27d1b4a16028da3a6944fade35a1709c1d8be3911d2f79672f83d764928f",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b6ec514ad1dcf7277ef3529d9ba911b828b45fb0613fff291d855c96c3a0b06",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea0cc24d89fef9ec26d0eb939e58206a23e54ec6e07832597606e687536062cf",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f650bc4ecefe0bd39fd40f7ef72252d48b3ddb6950ffc528dea4cf8b5e980f1b",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84c3405afab08db465d3e2575d584815df2673355f96c5ce2b1b0c8985056759",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:118d5b7f3126f6b576ad725692cfc284d99f3af3bc85ee802bfc2fd1fc4fdd63",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd7a20091b0f7ab7f6e4631028aeab79a36e787cc8bccc5e2924c5e892b7c6d2",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4964dbde59fcaece9645b48c39d72fdf66cd1d5c3f04c8c85a8f87719c425f76",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d75ffa2d71fb253191d6eedb442658dd7f5ea6842f00f6d165c43c6f00bc187",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c7aaffcb2eca16715f82eaf1c08f0d25e0c68921917340b9221839e3b727ed4",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ab670bdd8c832e8d63992a4109885230295067177585c86a2db0a441cfe2d0d5",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0d3026fe60e20675dde8932f9a21993be2c63bf54972633b22d24fdb61cc6ae",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5dc6bb6d45113480f7130a19f3fd334373c67e76d55eadc6f5e277d54022d3a4",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e6ec004130eacc00f7df57c38e523c849ea1a4338f2a8c4b0f5927ff42b3cace",
"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:6920fa716e223a2dd914942abbb16da7cd9adff61ad6dc6c9b38c2e815357fc1"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50ca2913bf7fa207163269c13053924310e467eaae5ac745539dacb43aea8ec9"
}
}
18 changes: 9 additions & 9 deletions assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.22.0-0.nightly-2026-03-17-033403"
"base": "4.22.0-0.nightly-2026-03-19-202824"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f20f857ce786727b82e9f8260037bddd444e4dc898757549d47d9f2db71667a7",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d47039279a829dea2e1488d94714265be71d277791c5f495c9c94059e5f83740",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7991be473de5fba721429f216d5043fa99d373c5b95332a981ef9c8cde56ef02",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:198863a1d295199013dbaf0d58077027af91abecf2af32968f7103368a0d2785",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a24fe6748e6b900cb8c458be0f620b2d5cd8dc034b420e18439032834096d23d",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c94ac137172fe33611f755f0381cb342d6ee1e055b7c36feadd4d8ddf6c75b8",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c2d77f0374558aab4a460f4941b2bd3df9ad631f6b1f6e85fcea6a20b19169a",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:424a846f004d9e0d45fb449b583bff6c61e13b9cd4ee65da64fe1df24746af96",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac61944e9934abe8334227525ab31ffa4a3d75757ec53da65b6e1ba5c6b6bf29",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5f9ee55f73353aec96b02224e9d2482ea3a21201c1d4d440dc70a0852728987",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a42312885710e41bc42b1cd8a59281a05f20f3334eec0879708bfdd0adf06f5",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78a057546f0e2f37d2faaf9eca4c6a99273d20f28e2e5678a530fffc415d69d5",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1659de68e4b1f880a33bfb610db0a31daef1e4a926b5354a5da95ab4f4f7de2",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b053169bffdaf651c0c435ee125ead1301144ce571d8397b7ef0ac77941b8cd9",
"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:8c8cd3558920cabcde8efd9e2669804ecf256692100d17284a27794692e02b40"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c6d86a7af660cb05363196c97c917ea9a8e1f9d12f94d636a58129a43ecc8d9"
}
}
4 changes: 4 additions & 0 deletions deps/github.com/openshift/kubernetes/DOWNSTREAM_OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ filters:
- p0lyn0mial
- tkashem
- benluddy
- jacobsee
- jubittajohn

# Approvers are limited to the team that manages rebases and pays the price for carries that are introduced
approvers:
Expand All @@ -19,6 +21,8 @@ filters:
- p0lyn0mial
- tkashem
- benluddy
- jacobsee
- jubittajohn

"^\\.go.(mod|sum)$":
labels:
Expand Down
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_amd64.conf
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:3c94ac137172fe33611f755f0381cb342d6ee1e055b7c36feadd4d8ddf6c75b8"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1659de68e4b1f880a33bfb610db0a31daef1e4a926b5354a5da95ab4f4f7de2"
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
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:118d5b7f3126f6b576ad725692cfc284d99f3af3bc85ee802bfc2fd1fc4fdd63"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5dc6bb6d45113480f7130a19f3fd334373c67e76d55eadc6f5e277d54022d3a4"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
Loading