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.19.0-0.nightly-arm64-2026-04-02-032829
OCP_VERSION := 4.19.0-0.nightly-arm64-2026-04-06-010346
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.19.0-0.nightly-2026-04-01-194622
OCP_VERSION := 4.19.0-0.nightly-2026-04-02-000704
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:3b27f7fc63cb9cdcaa488214a081b70cfe19664d3fed5a16bd5778672761b94e
digest: sha256:d0c86d8b2e06b2ddb3c0252dd43fd00db7d1cac51ad7039fb4cfd9776484c6f6
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:95f642f715dec2122c9e37bff65aa08b2da516b50c18eea4abd23fd7f3fd68e5
digest: sha256:e67e7bc0af9ff6f17a01aa4357480d09fb10fe0120a6e251ce23d0ecf8439978
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.19.0-0.nightly-arm64-2026-04-02-032829"
"base": "4.19.0-0.nightly-arm64-2026-04-06-010346"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b27f7fc63cb9cdcaa488214a081b70cfe19664d3fed5a16bd5778672761b94e",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95f642f715dec2122c9e37bff65aa08b2da516b50c18eea4abd23fd7f3fd68e5"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0c86d8b2e06b2ddb3c0252dd43fd00db7d1cac51ad7039fb4cfd9776484c6f6",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e67e7bc0af9ff6f17a01aa4357480d09fb10fe0120a6e251ce23d0ecf8439978"
}
}
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.19.0-0.nightly-2026-04-01-194622"
"base": "4.19.0-0.nightly-2026-04-02-000704"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70ff0ef04ae46f30e9e492c7ef223144a170bf732c08a6061263c7c4e6cbf011",
Expand Down
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:9cfbcd60d17cac12cec933cbeb6990d3a0e902af5cebed7b80fa72501c66b6e5
digest: sha256:be6e6976a256d6a4d5d86cded40f67eb6771a6645ee848ef09f1a6cce01025eb
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:aa37496282f2ec5d6f190ba901449a936cc6a319d05ee3725002dbda3a588e57
digest: sha256:d6cf30eac1b509cd2b976834ddc6ec96e10c141b8a9bce57adce53f003688d8d
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:5c9103797165d1ae0152d24f8ba8cc8f68c4bffc4c87084ca9145b1fd439a014
digest: sha256:71700bc05d11860ee54ef08839b3e2db77b9f3e45c7132c9f1251bb5093b3611

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:aa37496282f2ec5d6f190ba901449a936cc6a319d05ee3725002dbda3a588e57
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6cf30eac1b509cd2b976834ddc6ec96e10c141b8a9bce57adce53f003688d8d
- 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:9cfbcd60d17cac12cec933cbeb6990d3a0e902af5cebed7b80fa72501c66b6e5
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be6e6976a256d6a4d5d86cded40f67eb6771a6645ee848ef09f1a6cce01025eb
target:
kind: Deployment
labelSelector: app=catalog-operator
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2026-04-02-032829"
"base": "4.19.0-0.nightly-arm64-2026-04-06-010346"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9cfbcd60d17cac12cec933cbeb6990d3a0e902af5cebed7b80fa72501c66b6e5",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa37496282f2ec5d6f190ba901449a936cc6a319d05ee3725002dbda3a588e57",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c9103797165d1ae0152d24f8ba8cc8f68c4bffc4c87084ca9145b1fd439a014"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be6e6976a256d6a4d5d86cded40f67eb6771a6645ee848ef09f1a6cce01025eb",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6cf30eac1b509cd2b976834ddc6ec96e10c141b8a9bce57adce53f003688d8d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:71700bc05d11860ee54ef08839b3e2db77b9f3e45c7132c9f1251bb5093b3611"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-2026-04-01-194622"
"base": "4.19.0-0.nightly-2026-04-02-000704"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79188e927cda7ea0c8b94ffc54066650b2e2713bbdb1b64b71ffce270a25354a",
Expand Down
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.19.0-0.nightly-arm64-2026-04-02-032829"
"base": "4.19.0-0.nightly-arm64-2026-04-06-010346"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3126f5ae04869a108aa0f44d234558d585fbb5769fe6ac7bdf2b1e53b12a9468",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f807d1e6e67d36e53df773580614cb7b01c1c6fdc2e140d456d05a9c73ad713f",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ab1867b7445717cc8e2bf3d9577e3026357c83e482ac12fc1e27a22a0203e9a3",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c9103797165d1ae0152d24f8ba8cc8f68c4bffc4c87084ca9145b1fd439a014",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:933dd0f7d328a729bdc5f52fef6667a65649c144509a37f1ce248abcf9b4fe97",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8cdb06fe9225ef005e4f8d9c7f519d8f76cd4f2d88d7a59e6149803ed475cb75",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c448ef693c3a0d316576f5ffc9f6d883603133488f6270a89f01905771bea379",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1335953e29f612e9660a9eb14b2a923c19afe8dce735f94a38e01d6cf0165392",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69fb1bf697f1664ac02dfd84f0e8c0381eb312eda46315fcd112e9d9d1a52cab",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2245541b102a9b6c73e0e864b9cbe11263d4d710a31ef9c31ee16c906a17a51d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:71700bc05d11860ee54ef08839b3e2db77b9f3e45c7132c9f1251bb5093b3611",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b9512666e96cea15fdd7e1f2c2d07fe078e628a6fdfec2baf7f46b384c5c8bd",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f740141fc53c66df3f737f90e647301478d75a35c065073efcf181c859e4164",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f66ab17cb3c443768cba1e1065d32d9ecd3ebf017c9e7e6ea77c3f881ffe48b7",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:03771d66c0ed8a422c012ffaf6f390d8c3191e02330ef9b9dee00af518928d6e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fce863f0bee18722de43c92574513d4886f0c2cf3aae35174340b8af23a7e2a6"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7dfb268508f95ed45ca217414dcc5758026f9c0e932e0ade123f48fb1003f495"
}
}
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.19.0-0.nightly-2026-04-01-194622"
"base": "4.19.0-0.nightly-2026-04-02-000704"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77ddd0677ceda1221e5165610dc5bd8adbc276d93c14de0d8eb238fff55ffd27",
Expand Down
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 @@ -24,6 +24,6 @@ plugin_dirs = [
# 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:8cdb06fe9225ef005e4f8d9c7f519d8f76cd4f2d88d7a59e6149803ed475cb75"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f740141fc53c66df3f737f90e647301478d75a35c065073efcf181c859e4164"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
21 changes: 13 additions & 8 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
- cluster-network-operator embedded-component b7adb6895b84c1916904e6eccd93ce578731171f to c56dbe730979a72781c87e01bb5bccffe527e6c6
- e97a257 2026-01-21T09:06:18+00:00 Skip _stackmanager execution for libreswan 5.3+

- machine-config-operator embedded-component 18f009eeb40748895fe8a6eba3778ad275655124 to 9c50d5330ae771d7e8682cbb58480867b2a874da
- ebbe491b 2026-03-28T10:36:19+00:00 server: re-order logger setting

- operator-framework-olm embedded-component 457b7eb2fdaeb469c117c3e87201ba88281795b4 to 93649380ab6fdccf8ec1716f89162b506c7de172
- 70ea3b50 2026-03-30T14:20:21+08:00 Fix nil pointer dereference in sortUnpackJobs when sorting non-failed jobs (#3793)
- ovn-kubernetes image-arm64 208e0c7fabe0462cdec6d5ae9df4aa0c412f6a81 to 253d3ed8c6babe1b07fcb7910df3ebaf2d3c5b33
- 26f25084 2026-02-26T18:27:26+01:00 nodeallocator: fix subnet leak when hybrid overlay is enabled
- c8ada1f6 2026-02-24T11:35:02+01:00 Fix IC cluster cleanup tests zone configuration
- e61ba4ba 2026-02-24T11:35:02+01:00 Remove IC zone migration HACK code
- b1669576 2026-01-21T14:00:27+01:00 fix(localnet, ipamless): Prevent LSP deletion on sync
- 3e2e21c5 2026-01-14T09:09:40+01:00 Replace 0/1 index var to utilnet ipFamily
- 484a18f3 2026-01-14T09:09:35+01:00 Skip Multi Homing tests on ipv6 singlestack BGP lane
- a4ef8dce 2026-01-14T09:09:31+01:00 Fix bgp tests to work on single stack ipv6
- 42359641 2026-01-14T09:09:25+01:00 Add singlestack ipv6 bgp lane
- 925ae3bc 2026-01-14T09:09:21+01:00 Add e2e test towards kapi ipv6 address from udn pods
- 83fa5f7d 2026-01-14T09:07:51+01:00 Make ip and ipv6 constants in flow code
- 983ea56a 2026-01-14T09:04:25+01:00 Consider more than 1 family serviceCIDR range for UDN service flows
- 2e5be2d4 2026-01-14T08:52:13+01:00 Fix UDN service CIDR flows that had protocol prefix pinned to `ip`

2 changes: 1 addition & 1 deletion scripts/auto-rebase/commits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ https://github.com/openshift/coredns image-arm64 4f64931403bf747b78bccb40ad877b0
https://github.com/openshift/csi-external-snapshotter image-arm64 580c6960cd665dfdc3d77538bb7744b8754aca26
https://github.com/openshift/router image-arm64 5fe8cc069b2f44b3393545ac92c3201e8a87d82b
https://github.com/openshift/kube-rbac-proxy image-arm64 591277560f328601273f88f2881e09ccccd90a97
https://github.com/openshift/ovn-kubernetes image-arm64 208e0c7fabe0462cdec6d5ae9df4aa0c412f6a81
https://github.com/openshift/ovn-kubernetes image-arm64 253d3ed8c6babe1b07fcb7910df3ebaf2d3c5b33
https://github.com/openshift/kubernetes image-arm64 a674efabac8b5044e6256ce4e2385914be215376
https://github.com/openshift/service-ca-operator image-arm64 4dfa6916f984d0fd7188380edc88b250738f07f7
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.19.0-0.nightly-2026-04-01-194622" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2026-04-02-032829"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2026-04-02-000704" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2026-04-06-010346"