Skip to content

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2026-03-26-041753_amd64-2026-03-26_arm64-2026-04-01 #6447

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

Merged
openshift-merge-bot merged 4 commits into from
Apr 2, 2026
Merged

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2026-03-26-041753_amd64-2026-03-26_arm64-2026-04-01 #6447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7637b11
update last_rebase.sh
Apr 2, 2026
5fef0e1
update changelog
Apr 2, 2026
5c3cb0a
update manifests
Apr 2, 2026
5f3d17a
update buildfiles
Apr 2, 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.18.0-0.nightly-arm64-2026-03-29-232143
OCP_VERSION := 4.18.0-0.nightly-arm64-2026-04-01-232144
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2026-03-29-232143"
"base": "4.18.0-0.nightly-arm64-2026-04-01-232144"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91edf5679018055bc2cb9189d05aee7f35f339ad6e8abf7e1ef37a90c3c6ff35",
Expand Down
8 changes: 4 additions & 4 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,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:cec1e663c9b454cb05355c22f1594606692c4e145f35b83c40a723e68c6655e3
digest: sha256:80cf4182b92e8a5baf4bddec2e8000ff41ccced7abfb674bbdac9681a16d90aa
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:84351aee4592ae4e007cb5c5ed11722f7464a57c92fcc14bd2e3e57df89cdb30
digest: sha256:bf7796a72d725021fd1416e93b53535d9ea7adc7bf3168bde1ca2589a637253c
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:929d27000955d2ca2913ba8a380e0311762522a5c1cd6a8ae1790d6f1d7b4e57
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84351aee4592ae4e007cb5c5ed11722f7464a57c92fcc14bd2e3e57df89cdb30
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf7796a72d725021fd1416e93b53535d9ea7adc7bf3168bde1ca2589a637253c
- 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:cec1e663c9b454cb05355c22f1594606692c4e145f35b83c40a723e68c6655e3
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80cf4182b92e8a5baf4bddec2e8000ff41ccced7abfb674bbdac9681a16d90aa
target:
kind: Deployment
labelSelector: app=catalog-operator
6 changes: 3 additions & 3 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.18.0-0.nightly-arm64-2026-03-29-232143"
"base": "4.18.0-0.nightly-arm64-2026-04-01-232144"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cec1e663c9b454cb05355c22f1594606692c4e145f35b83c40a723e68c6655e3",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84351aee4592ae4e007cb5c5ed11722f7464a57c92fcc14bd2e3e57df89cdb30",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80cf4182b92e8a5baf4bddec2e8000ff41ccced7abfb674bbdac9681a16d90aa",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf7796a72d725021fd1416e93b53535d9ea7adc7bf3168bde1ca2589a637253c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:929d27000955d2ca2913ba8a380e0311762522a5c1cd6a8ae1790d6f1d7b4e57"
}
}
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2026-03-29-232143"
"base": "4.18.0-0.nightly-arm64-2026-04-01-232144"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd5bcf11f7984af4287c26d66c2998238246f0c5c33676ab2fa0dd0c3ff35913",
Expand Down
3 changes: 0 additions & 3 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
- machine-config-operator embedded-component ddf9a058799932c22942bdbef849178a6321c883 to 7d117b24b0419a2297f4f087d52b12a72cc89c88
- f4f819c0 2026-03-25T01:24:44+00:00 create default-timeout-stop dropin

2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
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.18.0-0.nightly-2026-03-26-041753" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-03-29-232143"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2026-03-26-041753" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-04-01-232144"