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-06-04-000446
OCP_VERSION := 4.19.0-0.nightly-arm64-2026-06-07-222914
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-06-03-154141
OCP_VERSION := 4.19.0-0.nightly-2026-06-07-154252
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.19.0-0.nightly-arm64-2026-06-04-000446"
"base": "4.19.0-0.nightly-arm64-2026-06-07-222914"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0f27ba0a74e9c70ee58ec7725d52d6eaf439844f766a493e68e59e18314f288",
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.19.0-0.nightly-2026-06-03-154141"
"base": "4.19.0-0.nightly-2026-06-07-154252"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e383d8afe4edbe8528ab09e66defac5c4b7f36608a7d2b35b5073072807d3037",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2026-06-04-000446"
"base": "4.19.0-0.nightly-arm64-2026-06-07-222914"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ebe8ad1c42a54a539bfc3ff589193e97d20f63fd774c3aa9b76ce2938e59ec2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-2026-06-03-154141"
"base": "4.19.0-0.nightly-2026-06-07-154252"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3166badd339956e289e2197579742d9a386fb4d943d66f68da1e6439739856fd",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2026-06-04-000446"
"base": "4.19.0-0.nightly-arm64-2026-06-07-222914"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2134fe82cc6af396caedba38633cc668f6264301a129b28b8131aabb3add673f",
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.19.0-0.nightly-2026-06-03-154141"
"base": "4.19.0-0.nightly-2026-06-07-154252"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12613aa448ceedd54b4e16c8479cb6d86391336f158e38b5ca640f634d0f6c4c",
Expand Down
47 changes: 2 additions & 45 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,46 +1,3 @@
- cluster-network-operator embedded-component 3084be080a60dedded177ea4accbd0d30335ebf5 to 945b31bdb28f5654dfadba0169185c95588f46b0
- 5c27d9c 2026-04-24T11:54:53-04:00 Address CodeRabbit review: add docstring and assertion messages
- 2fadf87 2026-04-24T11:54:53-04:00 Handle zero-worker HyperShift clusters in daemonset rollout

- csi-external-snapshotter embedded-component 580c6960cd665dfdc3d77538bb7744b8754aca26 to 8a319b5b9df2d4f596b4619f73cf5a65eab031c1
- 18645c7 2026-05-20T14:59:21+01:00 UPSTREAM: 1403: Replace google.golang.org/grpc with a fork to address CVE-2026-33186
- 4831ad0 2026-05-20T14:56:29+01:00 UPSTREAM: <drop>: vendor changes

- machine-config-operator embedded-component 8ae22ee4b3a0e83ae20550aebcbd4c39178c83b8 to 09ddec72f4ebeec4b2615da078c65e49b79bbe36
- e62a6238 2026-05-28T09:30:26+02:00 TestNoReboot should only consider password hash in /etc/shadow
- c74d91d4 2026-05-28T09:12:27+02:00 OCPBUGS-83830: Apply password only if changes exist
- 25a34f60 2026-05-27T15:05:53+00:00 drain: fix re-cordon detection
- 573fa7bf 2026-05-26T18:36:49+00:00 daemon: use --delete-if-present for karg removal
- 577d3ad9 2026-05-20T06:59:34+00:00 OCPBUGS-84332: Fix ssh and password rollbacks
- 6e1f4067 2026-05-19T09:04:10-04:00 controller: add terminationMessagePolicy to build pod containers
- 2ab26b1c 2026-05-13T20:21:34+00:00 OCPBUGS-84218: Fix units rollback if update failure
- 6eab77a8 2025-12-02T22:01:21+00:00 OCPBUGS-62232: Set -fin timeouts in HAProxy config

- operator-framework-olm embedded-component 93649380ab6fdccf8ec1716f89162b506c7de172 to c606498ade273e9392d6b10713a1e926c09095b0
- 50846aff 2026-05-29T12:02:49+05:30 Fix CVE-2026-33186 with openshift-sustaining/grpc-go v1.75.1-sec.1 for Go 1.23

- route-controller-manager embedded-component 25d79fdf101f3d41f4583a970e5f324b79fb42d8 to 6068e2c71fc1efb67324a91f48c1470c647f1344
- a4a64d3 2026-05-01T14:53:36+00:00 OCPBUGS-80378: Bump google.golang.org/grpc to v1.79.3

- csi-external-snapshotter image-amd64 580c6960cd665dfdc3d77538bb7744b8754aca26 to 8a319b5b9df2d4f596b4619f73cf5a65eab031c1
- 18645c7 2026-05-20T14:59:21+01:00 UPSTREAM: 1403: Replace google.golang.org/grpc with a fork to address CVE-2026-33186
- 4831ad0 2026-05-20T14:56:29+01:00 UPSTREAM: <drop>: vendor changes

- router image-amd64 5fe8cc069b2f44b3393545ac92c3201e8a87d82b to 0b3d3db1b41dde99861efcd35b4ea4f5ee0d360f
- 272a35b 2026-05-01T16:13:07+00:00 OCPBUGS-80456: Bump google.golang.org/grpc to v1.79.3
- 8c9e82a 2026-04-27T17:00:57+01:00 Adding escapeHAProxySingleQuotes for sanitize

- ovn-kubernetes image-amd64 ef09b1d4678c0bd9670ce99f23a6f958f9f4e306 to cb4cebc4fe27b0e07d0eb3c4411470a520373e5c
- 20b802cc 2026-03-31T13:15:36+02:00 CUDN: cleanup NADs in terminating namespaces without pods

- csi-external-snapshotter image-arm64 580c6960cd665dfdc3d77538bb7744b8754aca26 to 8a319b5b9df2d4f596b4619f73cf5a65eab031c1
- 18645c7 2026-05-20T14:59:21+01:00 UPSTREAM: 1403: Replace google.golang.org/grpc with a fork to address CVE-2026-33186
- 4831ad0 2026-05-20T14:56:29+01:00 UPSTREAM: <drop>: vendor changes

- router image-arm64 5fe8cc069b2f44b3393545ac92c3201e8a87d82b to 0b3d3db1b41dde99861efcd35b4ea4f5ee0d360f
- 272a35b 2026-05-01T16:13:07+00:00 OCPBUGS-80456: Bump google.golang.org/grpc to v1.79.3
- 8c9e82a 2026-04-27T17:00:57+01:00 Adding escapeHAProxySingleQuotes for sanitize

- ovn-kubernetes image-arm64 ef09b1d4678c0bd9670ce99f23a6f958f9f4e306 to cb4cebc4fe27b0e07d0eb3c4411470a520373e5c
- 20b802cc 2026-03-31T13:15:36+02:00 CUDN: cleanup NADs in terminating namespaces without pods
- machine-config-operator embedded-component 09ddec72f4ebeec4b2615da078c65e49b79bbe36 to 2a19fa0e641255ad70c96e5948f799fcc7b53a0c
- 261d2300 2026-06-03T14:07:38+00:00 chore: update AMIs

2 changes: 1 addition & 1 deletion 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 8a319b5
https://github.com/openshift/etcd embedded-component 3ebce536634cb76794f1b9668072a094c132c16a
https://github.com/openshift/kubernetes embedded-component a674efabac8b5044e6256ce4e2385914be215376
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component fdef30c84b3d45ede364500984221c3f492b1415
https://github.com/openshift/machine-config-operator embedded-component 09ddec72f4ebeec4b2615da078c65e49b79bbe36
https://github.com/openshift/machine-config-operator embedded-component 2a19fa0e641255ad70c96e5948f799fcc7b53a0c
https://github.com/openshift/openshift-controller-manager embedded-component 5b3063ff149f290bebca0783fc508dfbf07689a5
https://github.com/openshift/operator-framework-olm embedded-component c606498ade273e9392d6b10713a1e926c09095b0
https://github.com/openshift/route-controller-manager embedded-component 6068e2c71fc1efb67324a91f48c1470c647f1344
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.19.0-0.nightly-2026-06-03-154141" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2026-06-04-000446"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2026-06-07-154252" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2026-06-07-222914"