Skip to content
Merged
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.version.aarch64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-05-18-195115
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-05-20-004958
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-05-18-130120
OCP_VERSION := 4.22.0-0.nightly-2026-05-19-113338
2 changes: 1 addition & 1 deletion assets/components/multus/release-multus-aarch64.json
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-195115"
"base": "4.22.0-0.nightly-arm64-2026-05-20-004958"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:655a9d04510059e5a465b9c38875eccd27dd26cfb9ef8bcecd3c4966fe071798",
Expand Down
2 changes: 1 addition & 1 deletion assets/components/multus/release-multus-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.22.0-0.nightly-2026-05-18-130120"
"base": "4.22.0-0.nightly-2026-05-19-113338"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:748798f55aed433eef0e451283359084fa1e74adf11cd4d89ee1403774f8fdd3",
Expand Down
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-195115"
"base": "4.22.0-0.nightly-arm64-2026-05-20-004958"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:197e653ef871c5df107f7899a64b0575bd33537d053f77ed062679c208d53835",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.22.0-0.nightly-2026-05-18-130120"
"base": "4.22.0-0.nightly-2026-05-19-113338"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:524b90fabbab585fab59f637700ab445ee08640aee67d714ae1fb2783af2cb3d",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ data:
Nvidia_mlx5_ConnectX-6_Dx: 15b3 101d 101e
Nvidia_mlx5_ConnectX-6_Lx: 15b3 101f 101e
Nvidia_mlx5_ConnectX-7: 15b3 1021 101e
Nvidia_mlx5_ConnectX-8: 15b3 1023 101e
Pensando_ionic_DSC: 1dd8 1002 1003
Qlogic_qede_QL41000: 1077 8070 8090
Qlogic_qede_QL45000_25G: 1077 1656 1664
Expand Down
6 changes: 3 additions & 3 deletions assets/optional/sriov/kustomization.aarch64.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
images:
- name: quay.io/openshift/sriov-network-operator
newName: registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator
digest: sha256:bd991c78d77a0fcf66b6278cebd72e1729115a5f3fe356d19a44465780f85da5
digest: sha256:c293cc71af91c226517964ed114c81f4344e26512d5719652f85289a4ea163bd

patches:
- patch: |-
Expand All @@ -24,12 +24,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: SRIOV_NETWORK_CONFIG_DAEMON_IMAGE
value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:6918d9b4f422f5e3a332b69ba418322253e632f366bc90770c4e1ceba61bdcec
value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:fd3885f566e67e28d3997c72e4f7587914925c415dbb78152dd8004788ad1172
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: SRIOV_NETWORK_WEBHOOK_IMAGE
value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:839937f55c16991d955079ea4cd994e3f8b3c2098d97a531c05881934954d676
value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:aff6f79b34d1024b2bd988deee16cfd6c62414edf69ac757b952fa1b4702ad32
- op: add
path: /spec/template/spec/containers/0/env/-
value:
Expand Down
6 changes: 3 additions & 3 deletions assets/optional/sriov/kustomization.x86_64.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
images:
- name: quay.io/openshift/sriov-network-operator
newName: registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator
digest: sha256:7f8e7179cf8ba48da864f620664352844ccbbc3ba895b0ddf2dd37e27342728b
digest: sha256:fab84896e080fa9c227e3b6a0bb95b600263319278c9fc0af8859f44b4a905fa

patches:
- patch: |-
Expand All @@ -24,12 +24,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: SRIOV_NETWORK_CONFIG_DAEMON_IMAGE
value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:1acc869679679505bb1b1e9d8e1c2841cff45c9ef4ba0358f1041484f2216c3a
value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:a59a8ba3808d17f305faa6f4589126a8898afef2a3a70aed836657f1f718d023
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: SRIOV_NETWORK_WEBHOOK_IMAGE
value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:984ff73d913496355c7a0f4744782f27a5a61c8555febcb61e20e2dc954d8384
value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:aba452f90cd9e1e96ec7c98d56162d0d50e107c0b942c269716f2a6a1702a17b
- op: add
path: /spec/template/spec/containers/0/env/-
value:
Expand Down
8 changes: 4 additions & 4 deletions assets/optional/sriov/release-sriov-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.21.0-202604221819"
"base": "4.21.0-202605111950"
},
"images": {
"metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:6bbb9a9e5f633ad2cabab4461d5223480ffa307cd134cdbce0d2e422b2a2b92f",
Expand All @@ -10,8 +10,8 @@
"sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:f0cfcc5d620abba58d9b93dea02be464aec316e084fdd732262501475da6fa53",
"sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:8640f32cbbfc7046ae4d444ad29180366ff6468d32113ccac87fcbdb771b613c",
"sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:08465119175ce2349639c45e23c130fdf041e5cc23a66b0b9f35e4bc7f899f93",
"sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:6918d9b4f422f5e3a332b69ba418322253e632f366bc90770c4e1ceba61bdcec",
"sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:bd991c78d77a0fcf66b6278cebd72e1729115a5f3fe356d19a44465780f85da5",
"sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:839937f55c16991d955079ea4cd994e3f8b3c2098d97a531c05881934954d676"
"sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:fd3885f566e67e28d3997c72e4f7587914925c415dbb78152dd8004788ad1172",
"sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:c293cc71af91c226517964ed114c81f4344e26512d5719652f85289a4ea163bd",
"sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:aff6f79b34d1024b2bd988deee16cfd6c62414edf69ac757b952fa1b4702ad32"
}
}
8 changes: 4 additions & 4 deletions assets/optional/sriov/release-sriov-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.21.0-202604221819"
"base": "4.21.0-202605111950"
},
"images": {
"metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:6e6962f517ca7c45453c86cbd0ed83089177b4091d4edb14346653f1b4043da4",
Expand All @@ -10,8 +10,8 @@
"sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:d41e3385e68670f70c8f10e1a78bbbf984433b1fc74a2bf107e1e5b0b41197d4",
"sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:6c2f8ac09bb291389f96a0595a0b774683686554255b66f7555edf8ad4df3d9c",
"sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:8e6bf579804c1cdd2118808c40d4d20a97ad4d54c6937b2b55f78ee5e08929cf",
"sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:1acc869679679505bb1b1e9d8e1c2841cff45c9ef4ba0358f1041484f2216c3a",
"sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:7f8e7179cf8ba48da864f620664352844ccbbc3ba895b0ddf2dd37e27342728b",
"sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:984ff73d913496355c7a0f4744782f27a5a61c8555febcb61e20e2dc954d8384"
"sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:a59a8ba3808d17f305faa6f4589126a8898afef2a3a70aed836657f1f718d023",
"sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:fab84896e080fa9c227e3b6a0bb95b600263319278c9fc0af8859f44b4a905fa",
"sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:aba452f90cd9e1e96ec7c98d56162d0d50e107c0b942c269716f2a6a1702a17b"
}
}
4 changes: 2 additions & 2 deletions assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.22.0-0.nightly-arm64-2026-05-18-195115"
"base": "4.22.0-0.nightly-arm64-2026-05-20-004958"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88b77851bd769ebeecc9eaa52168e8f995002dcac011e16dfb2c18a44c1c92bc",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad0db9fb2a14ce9610c6edf822d0f3439f578bc55916d5a2473c801cee9299b0",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a53efb1d535e69b0be02c3e72647f2f0adcd4ca361290b3ff6bf5cb84c50f88a",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:801571bf622c46e7f315058626ad1ed7153ce7831a15af1dfab82182632676c1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:86c4a72a60ae74d80c28edb895cfabd44117651c748acd374125d0e93b2c0be3",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:06af8f6b747e394abec436df73fd480c54a65693d059ed12bb03086bb0c84a58",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.22.0-0.nightly-2026-05-18-130120"
"base": "4.22.0-0.nightly-2026-05-19-113338"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:570e8cf68b924824188ac24a813c85b845d826d0b84989edfbceb14d78887608",
Expand Down
48 changes: 6 additions & 42 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,44 +1,8 @@
- cluster-kube-apiserver-operator embedded-component 1741228b58952244aceb8e74d35f918431717191 to fb68eab51544f9dffac9916796723f6cee4faf3c
- 9bac764 2026-05-12T15:08:27-04:00 vendor: bump library-go for atomicdir fsync fix
- machine-config-operator embedded-component c7abfa0bd88d48bc7a8d8b70d982127d2b6a9158 to 6ff546c6bf38055a335625191c60dcc9c7c714d2
- 37e6da35 2026-05-06T15:34:10Z daemon: use --delete-if-present for karg removal

- kubernetes embedded-component 6b9ddbe6e09aa225e949baecde4145208bf94c8e to c5ea727d19837f8a22cda5c0ba8899960b7777ff
- c3b2ba200 2026-05-12T17:01:37-04:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
- 6636cbce3 2026-05-12T09:50:49Z Release commit for Kubernetes v1.35.5
- b9ffe7c06 2026-05-11T11:25:41+02:00 kubeadm: use dedicated ClusterRole for apiserver kubelet client
- 7909267f8 2026-05-06T11:08:39+02:00 kubeadm: skip LocalAPIEndpoint defaulting on worker join
- f79279632 2026-04-29T17:39:56+02:00 kubeadm: use the localAPIEndpoint for all API calls in 'init'
- faa811285 2026-04-28T07:49:50Z kube-proxy: don't do full periodic syncs on large cluster mode
- 943d94194 2026-04-26T09:54:46Z Delete remote endpoint if it has same ip as local endpoint in the system.
- d550d458d 2026-04-26T09:54:46Z Delete remote endpoint if it has same ip as local endpoint in the system.
- 6d314b2fd 2026-04-23T09:15:12+01:00 Add a (*Client) addEndpoint method
- feb7fa111 2026-04-23T09:15:11+01:00 Evaluate etcd cluster health using quorum
- 1a7f0b3de 2026-04-21T10:55:12+02:00 Escape path inside the container
- 6953afbad 2026-04-17T06:40:11Z scheduler: address recreated pod review feedback
- bf14155eb 2026-04-17T06:39:06Z scheduler: skip requeueing recreated pods on scheduling failure
- 55f12e847 2026-04-17T06:36:28Z scheduler: fix inFlightPods leak when pod is recreated during scheduling failure
- 31d47ca37 2026-04-15T18:12:54Z Update CHANGELOG/CHANGELOG-1.35.md for v1.35.4
- 69dd59d5b 2026-04-01T11:11:34-07:00 podStartSLOduration excludes init container runtime and image pulling time, includes only stateless and immediately schedulable pods

- machine-config-operator embedded-component 864d1bc04264397caddb7ff1ffa43fc5502aa5e7 to c7abfa0bd88d48bc7a8d8b70d982127d2b6a9158
- 1c422991 2026-05-14T14:12:56Z e2e: fix up baremetal skew test
- 3f9451c5 2026-05-14T10:09:12Z TestNoReboot should only consider password hash in /etc/shadow
- 267488fe 2026-05-07T06:24:30Z controller: add terminationMessagePolicy to build pod containers

- kubernetes image-amd64 6b9ddbe6e09aa225e949baecde4145208bf94c8e to c5ea727d19837f8a22cda5c0ba8899960b7777ff
- c3b2ba200 2026-05-12T17:01:37-04:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
- 6636cbce3 2026-05-12T09:50:49Z Release commit for Kubernetes v1.35.5
- b9ffe7c06 2026-05-11T11:25:41+02:00 kubeadm: use dedicated ClusterRole for apiserver kubelet client
- 7909267f8 2026-05-06T11:08:39+02:00 kubeadm: skip LocalAPIEndpoint defaulting on worker join
- f79279632 2026-04-29T17:39:56+02:00 kubeadm: use the localAPIEndpoint for all API calls in 'init'
- faa811285 2026-04-28T07:49:50Z kube-proxy: don't do full periodic syncs on large cluster mode
- 943d94194 2026-04-26T09:54:46Z Delete remote endpoint if it has same ip as local endpoint in the system.
- d550d458d 2026-04-26T09:54:46Z Delete remote endpoint if it has same ip as local endpoint in the system.
- 6d314b2fd 2026-04-23T09:15:12+01:00 Add a (*Client) addEndpoint method
- feb7fa111 2026-04-23T09:15:11+01:00 Evaluate etcd cluster health using quorum
- 1a7f0b3de 2026-04-21T10:55:12+02:00 Escape path inside the container
- 6953afbad 2026-04-17T06:40:11Z scheduler: address recreated pod review feedback
- bf14155eb 2026-04-17T06:39:06Z scheduler: skip requeueing recreated pods on scheduling failure
- 55f12e847 2026-04-17T06:36:28Z scheduler: fix inFlightPods leak when pod is recreated during scheduling failure
- 31d47ca37 2026-04-15T18:12:54Z Update CHANGELOG/CHANGELOG-1.35.md for v1.35.4
- 69dd59d5b 2026-04-01T11:11:34-07:00 podStartSLOduration excludes init container runtime and image pulling time, includes only stateless and immediately schedulable pods
- coredns image-arm64 0dded2d232dab43c107b1dab9d0d9fdfd8259622 to 9a71d9a6b788437e755b5ed3bfad78c63fa7c6f4
- 7db70e5 2026-05-19T10:46:26-04:00 Fix GO-2026-4918: Bump golang.org/x/net to v0.53.0
- 8316b33 2026-05-19T10:46:26-04:00 Fix GO-2025-4245: Bump github.com/expr-lang/expr to v1.17.7
- 38d839a 2026-05-19T10:46:26-04:00 OCPBUGS-83943: Bump gRPC to v1.79.3 to resolve CVE-2026-33186

4 changes: 2 additions & 2 deletions scripts/auto-rebase/commits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ https://github.com/openshift/csi-external-snapshotter embedded-component d1bc3ff
https://github.com/openshift/etcd embedded-component d8d67b8ce849f816d6d23c904098336632e2348f
https://github.com/openshift/kubernetes embedded-component c5ea727d19837f8a22cda5c0ba8899960b7777ff
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 72835e43c7754356645e41031f3a99926b4d42e6
https://github.com/openshift/machine-config-operator embedded-component c7abfa0bd88d48bc7a8d8b70d982127d2b6a9158
https://github.com/openshift/machine-config-operator embedded-component 6ff546c6bf38055a335625191c60dcc9c7c714d2
https://github.com/openshift/openshift-controller-manager embedded-component 26d20feae8892f648f5b06ed3f5492fe6ffb4532
https://github.com/openshift/operator-framework-olm embedded-component de6260e53055e10e216ec668d692a35554ab0585
https://github.com/openshift/route-controller-manager embedded-component 624742d93f3a7885cf7f70985f1e23ff60da580d
Expand All @@ -26,7 +26,7 @@ https://github.com/openshift/ovn-kubernetes image-amd64 72db5e8d8ec23d4108183a8c
https://github.com/openshift/kubernetes image-amd64 c5ea727d19837f8a22cda5c0ba8899960b7777ff
https://github.com/openshift/service-ca-operator image-amd64 9fff46a576033685f66fbb1121eb0a2f134a29be
https://github.com/openshift/oc image-arm64 66dee73f66c4f048c333c6a77d76871872027896
https://github.com/openshift/coredns image-arm64 0dded2d232dab43c107b1dab9d0d9fdfd8259622
https://github.com/openshift/coredns image-arm64 9a71d9a6b788437e755b5ed3bfad78c63fa7c6f4
https://github.com/openshift/csi-external-snapshotter image-arm64 d1bc3ffaa9759c13a06c2ec61c541342e71bd109
https://github.com/openshift/router image-arm64 896390778ebe15f57f87e6ca78f11c96e64c2652
https://github.com/openshift/kube-rbac-proxy image-arm64 d12e274605248f6c59373240a7eae7a7a357dcb3
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash -x
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-05-18-130120" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-05-18-195115"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-05-19-113338" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-05-20-004958"