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.18.0-0.nightly-arm64-2026-04-12-232347
OCP_VERSION := 4.18.0-0.nightly-arm64-2026-04-15-191820
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.18.0-0.nightly-2026-04-12-151606
OCP_VERSION := 4.18.0-0.nightly-2026-04-15-212456
4 changes: 2 additions & 2 deletions assets/optional/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:666b635f57e82a7735c0cfc6b0efe630db2bc61de19f99140e925efe8d6dec10
digest: sha256:5d6f5f78183b99d962955687ce1163ed78f8bf768bdd886081f330b5071f50fa
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:952ad268b8f3adb3e0cf5c97a5a68ffceea43b2c817e956a551c6cf2ab4e67d0
digest: sha256:4489ebdb5380905e5f80c4b341bb4e0cabe1f6768406416c6b21c07cb54b7649
4 changes: 2 additions & 2 deletions assets/optional/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:e99a62befac81c7f39bdeba8a8acbf1cd6f4a2db645fc3fc7f8f3025ef4b8d74
digest: sha256:f6765ecd6a609d6b06de26d8d894c82dbafc14d915c80ce9bcb16f3d625b4e80
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:91065fad3cb01d95ac1d3c4bcac50aeb79e07c7f4b7ef6cb24c6bb3cc1fe3600
digest: sha256:3ae56e7a9a1b1520d0f61c0e041d2f99de3235f6800a7ee55eaf49cbd65849ab
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2026-04-12-232347"
"base": "4.18.0-0.nightly-arm64-2026-04-15-191820"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:666b635f57e82a7735c0cfc6b0efe630db2bc61de19f99140e925efe8d6dec10",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:952ad268b8f3adb3e0cf5c97a5a68ffceea43b2c817e956a551c6cf2ab4e67d0"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d6f5f78183b99d962955687ce1163ed78f8bf768bdd886081f330b5071f50fa",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4489ebdb5380905e5f80c4b341bb4e0cabe1f6768406416c6b21c07cb54b7649"
}
}
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.18.0-0.nightly-2026-04-12-151606"
"base": "4.18.0-0.nightly-2026-04-15-212456"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e99a62befac81c7f39bdeba8a8acbf1cd6f4a2db645fc3fc7f8f3025ef4b8d74",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91065fad3cb01d95ac1d3c4bcac50aeb79e07c7f4b7ef6cb24c6bb3cc1fe3600"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f6765ecd6a609d6b06de26d8d894c82dbafc14d915c80ce9bcb16f3d625b4e80",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ae56e7a9a1b1520d0f61c0e041d2f99de3235f6800a7ee55eaf49cbd65849ab"
}
}
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:8431749c5f9a226869e81d844e8e1d4c4eb3a9d65ea0724ce184900b8f0120f5
digest: sha256:4773b245aec6565b0bfeb1b44ad8f716254898d5058c060b523444749fbdde9c
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:45b3d7bcb23fa939cdc3588eab7c1827d64324ef8455764bcc1e2d9fed9dec89
digest: sha256:bc1b6e64c3a1bd574f63f2e63694ffd1265771136a9784ee713ee6f5bcd7de1c
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:78e6715b278d1e8ff18a12b1adda7f406253fccc0bf86a8b849e2a2bfa49e299
digest: sha256:a2d726fa9b2d0f1996beb474453d1a8458aa9d74ed25f6f3866b2c945cc1ea81

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:45b3d7bcb23fa939cdc3588eab7c1827d64324ef8455764bcc1e2d9fed9dec89
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc1b6e64c3a1bd574f63f2e63694ffd1265771136a9784ee713ee6f5bcd7de1c
- 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:8431749c5f9a226869e81d844e8e1d4c4eb3a9d65ea0724ce184900b8f0120f5
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4773b245aec6565b0bfeb1b44ad8f716254898d5058c060b523444749fbdde9c
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:1e05a555379ec0108ce2ab5c5bf83c9c0ec3b16150735e631cc0ef44f4ec268d
digest: sha256:569d1c0f569eb1455631b18ddf3aaee0ea9dc5af3f7df29bdb62f54d7a6f190a
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:7aac2a59934f7f1c5cc030e6ee692e36b8aa17e0d9eb9f40d83e7c1224f5f03b
digest: sha256:7260c4512d18a9af59d3287bb293d5d1633fbde55830397b6254e91626a09a08
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:64800896219cd3c657b06747813308f89e4a4fe49e69eb57e2d6b9d9ae18af72
digest: sha256:211054e1b5dfc556eaa545685af3d99dcbe553ef4805a8ee25a44ffc084df8ba

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:7aac2a59934f7f1c5cc030e6ee692e36b8aa17e0d9eb9f40d83e7c1224f5f03b
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7260c4512d18a9af59d3287bb293d5d1633fbde55830397b6254e91626a09a08
- 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:1e05a555379ec0108ce2ab5c5bf83c9c0ec3b16150735e631cc0ef44f4ec268d
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:569d1c0f569eb1455631b18ddf3aaee0ea9dc5af3f7df29bdb62f54d7a6f190a
target:
kind: Deployment
labelSelector: app=catalog-operator
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2026-04-12-232347"
"base": "4.18.0-0.nightly-arm64-2026-04-15-191820"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8431749c5f9a226869e81d844e8e1d4c4eb3a9d65ea0724ce184900b8f0120f5",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45b3d7bcb23fa939cdc3588eab7c1827d64324ef8455764bcc1e2d9fed9dec89",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78e6715b278d1e8ff18a12b1adda7f406253fccc0bf86a8b849e2a2bfa49e299"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4773b245aec6565b0bfeb1b44ad8f716254898d5058c060b523444749fbdde9c",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc1b6e64c3a1bd574f63f2e63694ffd1265771136a9784ee713ee6f5bcd7de1c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2d726fa9b2d0f1996beb474453d1a8458aa9d74ed25f6f3866b2c945cc1ea81"
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.18.0-0.nightly-2026-04-12-151606"
"base": "4.18.0-0.nightly-2026-04-15-212456"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e05a555379ec0108ce2ab5c5bf83c9c0ec3b16150735e631cc0ef44f4ec268d",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7aac2a59934f7f1c5cc030e6ee692e36b8aa17e0d9eb9f40d83e7c1224f5f03b",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:64800896219cd3c657b06747813308f89e4a4fe49e69eb57e2d6b9d9ae18af72"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:569d1c0f569eb1455631b18ddf3aaee0ea9dc5af3f7df29bdb62f54d7a6f190a",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7260c4512d18a9af59d3287bb293d5d1633fbde55830397b6254e91626a09a08",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:211054e1b5dfc556eaa545685af3d99dcbe553ef4805a8ee25a44ffc084df8ba"
}
}
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.18.0-0.nightly-arm64-2026-04-12-232347"
"base": "4.18.0-0.nightly-arm64-2026-04-15-191820"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1f2eb994305706f2f1f565464b445a3fdc717f2eee54050a837edd598079039",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8ab9a7efd746d8ed74ca1dd525db290d8dd915ad756d2b06291b5d6da93ca23",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48441e2f6dfc6e58cfb58bc764b49d37a16ddf29832159e492bd886a1b941ed0",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78e6715b278d1e8ff18a12b1adda7f406253fccc0bf86a8b849e2a2bfa49e299",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e0a6c6177c4bb1d4b4c9dc6ae9b11d33166c3167bb975fb097bdf0b0a224c38",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:46804c63aafd80c378478cba599fc057788b94b3466f969f8a5bd8df1e0148f6",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3905c64fb92099027ea3ff1576e32df1a2fb620639f1ba0b2cd099eff79a4c70",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fb5c9be5b0327170ecff8b5908b09e2e662a4e90503508c42005ff81071ec458",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b767dfffa4a615f8b42e7773072186491f465291954849f61584ddb732ee960a",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:819b1f6057a63e26728e33c1eaa93fb3343e1e3da364975fc647aadf18083104",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2d726fa9b2d0f1996beb474453d1a8458aa9d74ed25f6f3866b2c945cc1ea81",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d883c2f2c69455424e1d8b2f809acfd31ca5bb3c5a28bbe251e54a36c50860df",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2aa4cb7dfb9055c72abaf0d3bb49ead44c261205349008d0b3f58bd84dc1cb7c",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17a9576b70345f42877cbde93152028684a9896ce0b6ad73aaf1dbbbe997e22e",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6d7ec62981a4d01f3dee4e8ac1b62b9e6e6fffe732a06e6d30033bf24dac52a"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a6ef6b425873f488c70ce9d6326f5836f6ec03790cd700205c0a51d670bd79c"
}
}
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.18.0-0.nightly-2026-04-12-151606"
"base": "4.18.0-0.nightly-2026-04-15-212456"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d878039bc070099a34c33a4d728e01aa7f3de9f85f1b604ca77d9e82e19a945",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:318ba96be2e919f018f675539c41eb4fa9fa6853752c97f87e19fee5993fe6f4",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd2ad2667ad43345f950737678493914100d9077ab70f9ad6d8abd618282e116",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:64800896219cd3c657b06747813308f89e4a4fe49e69eb57e2d6b9d9ae18af72",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c19d987180608233f593eea22df51aa952fd81812443bc18b546dc801b327ee",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:babc5ae30e00c0d7853dc0339daebcc743648e7a12c5833ebcc2026d60f39054",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e9025472c3d64b6cf5fa25addf2a340b56f68ec3144dfa7d52ec9173b5b3594",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8be4cac4970e1a10f8c09f687c58f06da94490d7066f396cf99abb1ca17631b",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8aec9d41fa28a58c06da3a546a1c769f510cc61aa27075801810df9704045073",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:591ea2bdd4da524be713012cc018beb9d8a42c7849cdcb96bedea4b4d6fb6d3d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:211054e1b5dfc556eaa545685af3d99dcbe553ef4805a8ee25a44ffc084df8ba",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3244aacf3692d15925086ba6b8a8a3b2812050eea224e8f14b67649fdb7ad41d",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0484b5a37e8452c4196416140eae98fea34b1678bfc08b58189e797c480c649f",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73cece342ba4eeddf58cd68c5406d14af3a2aa853b8568cf2e7ce37e4df4046c",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73c575b37676f15dea0f2ce72224ed1007ae49e55b7a2d53c074971f5a1698c9"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b70d5b3ea83133aaa3b0ac9e03cb89061cc19ac7e5ebaa13bcf1bb67efff589e"
}
}
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 @@ -25,6 +25,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:babc5ae30e00c0d7853dc0339daebcc743648e7a12c5833ebcc2026d60f39054"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0484b5a37e8452c4196416140eae98fea34b1678bfc08b58189e797c480c649f"
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 @@ -25,6 +25,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:46804c63aafd80c378478cba599fc057788b94b3466f969f8a5bd8df1e0148f6"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2aa4cb7dfb9055c72abaf0d3bb49ead44c261205349008d0b3f58bd84dc1cb7c"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
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.18.0-0.nightly-2026-04-12-151606" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-04-12-232347"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2026-04-15-212456" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-04-15-191820"