From 6b08993df58fa959b5421a4a03f73906f43a572f Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 25 May 2026 04:14:57 +0000 Subject: [PATCH 1/5] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 495f0fce2a..8b8acdc713 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -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-05-13-164455" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-05-17-225756" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2026-05-24-133035" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-05-25-004611" From 30b34fc81edbbf8c3082f0cc8f6e4e072044a351 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 25 May 2026 04:14:57 +0000 Subject: [PATCH 2/5] update changelog --- scripts/auto-rebase/changelog.txt | 12 +++++++++++- scripts/auto-rebase/commits.txt | 8 ++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 367250b296..3c7e1577cd 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,7 +1,17 @@ -- ovn-kubernetes image-arm64 2609f4261a2310228b926965b11b7b616c0bb418 to 0276ba1ace90f6182fc13894fc17150262974be6 +- cluster-network-operator embedded-component c836773db43651d272644c12d47a8d70a118c1d7 to bd2181ac81fe75f9ad611d99ec0a932624a63eaa + - d1612a3 2026-05-12T11:28:31+00:00 OCPBUGS-74401: Remove duplicated openssl parameter + +- machine-config-operator embedded-component 7d117b24b0419a2297f4f087d52b12a72cc89c88 to 1dd69a37a6a840654e2558c9cc26b8fa762ab312 + - a0fab6f4 2026-05-18T10:58:53+00:00 OCPBUGS-84218: Fix units rollback if update failure + +- ovn-kubernetes image-amd64 2609f4261a2310228b926965b11b7b616c0bb418 to 7e6b238838bc25c546022ba4ef3316fa98926d79 - 80518a91 2026-05-04T09:30:51+02:00 fix(kubevirt): Use pod network subnet gateway IP for DHCP router option - ef7ea17c 2026-04-23T15:54:57+01:00 virt: fix SyncVirtualMachines deleting UDN DHCP options during startup - 8df3403f 2026-04-15T09:39:23+00:00 Backport: Fix NAD Controller syncAll for networkID upgrade from node->NAD - 3928ae07 2026-04-08T16:39:36+08:00 egressip: Skip bridge configuration for secondary network IPs + - 20b802cc 2026-03-31T13:15:36+02:00 CUDN: cleanup NADs in terminating namespaces without pods - 2a5bf31c 2026-03-31T16:31:32+08:00 node: fix serviceUpdateNotNeeded nil pointer comparison +- ovn-kubernetes image-arm64 0276ba1ace90f6182fc13894fc17150262974be6 to 7e6b238838bc25c546022ba4ef3316fa98926d79 + - 20b802cc 2026-03-31T13:15:36+02:00 CUDN: cleanup NADs in terminating namespaces without pods + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index d328be7ed4..8266d3d380 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -5,14 +5,14 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 7ec6093 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component e9bc90906c726823f154c78d3e568c98ff77b6a5 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 6347fc8179b2a04d51c99432ae612bf4df595dc0 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 4e99db62cea1d2ca48765230c6f5663d1f2c2702 -https://github.com/openshift/cluster-network-operator embedded-component c836773db43651d272644c12d47a8d70a118c1d7 +https://github.com/openshift/cluster-network-operator embedded-component bd2181ac81fe75f9ad611d99ec0a932624a63eaa https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component f1711cf30f683ec0eaa187cd5168caae9e8c1254 https://github.com/openshift/cluster-policy-controller embedded-component 5fd852525909ce6eab52972ba9ce8fcf56528eb9 https://github.com/openshift/csi-external-snapshotter embedded-component 8ddbcd381bf5317c1d1a93db3b5760681a33cb27 https://github.com/openshift/etcd embedded-component b5a4f8d079fbb04200251d5a6bc7c56f79d9d1e3 https://github.com/openshift/kubernetes embedded-component 91c24081f468e7636c824f4f5a2eb68660b81012 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 815b43b7f7288da76dd314553e113aefe2a5897d -https://github.com/openshift/machine-config-operator embedded-component 7d117b24b0419a2297f4f087d52b12a72cc89c88 +https://github.com/openshift/machine-config-operator embedded-component 1dd69a37a6a840654e2558c9cc26b8fa762ab312 https://github.com/openshift/openshift-controller-manager embedded-component 8ee744063ed12b249f1a2b89e9af4f53b2f1daf7 https://github.com/openshift/operator-framework-olm embedded-component 4680ec1ee00e1af34e29ec598ac983bf74d2e523 https://github.com/openshift/route-controller-manager embedded-component ce6ffa24dac3a5f49f70818e1159e40eaf27a6a3 @@ -22,7 +22,7 @@ https://github.com/openshift/coredns image-amd64 8ca7f02b8becb40f7a9919243000e26 https://github.com/openshift/csi-external-snapshotter image-amd64 8ddbcd381bf5317c1d1a93db3b5760681a33cb27 https://github.com/openshift/router image-amd64 ccd9551702a89cac27e38ebb63801ddb6823d101 https://github.com/openshift/kube-rbac-proxy image-amd64 5a14ea9d338b2582c7c2a8f89f351a0c30f56371 -https://github.com/openshift/ovn-kubernetes image-amd64 2609f4261a2310228b926965b11b7b616c0bb418 +https://github.com/openshift/ovn-kubernetes image-amd64 7e6b238838bc25c546022ba4ef3316fa98926d79 https://github.com/openshift/kubernetes image-amd64 91c24081f468e7636c824f4f5a2eb68660b81012 https://github.com/openshift/service-ca-operator image-amd64 30efb529a5b7db5d6f352f6ac0470d8385268539 https://github.com/openshift/oc image-arm64 6febe61977471b066f08d513424b226b82ee518f @@ -30,6 +30,6 @@ https://github.com/openshift/coredns image-arm64 8ca7f02b8becb40f7a9919243000e26 https://github.com/openshift/csi-external-snapshotter image-arm64 8ddbcd381bf5317c1d1a93db3b5760681a33cb27 https://github.com/openshift/router image-arm64 ccd9551702a89cac27e38ebb63801ddb6823d101 https://github.com/openshift/kube-rbac-proxy image-arm64 5a14ea9d338b2582c7c2a8f89f351a0c30f56371 -https://github.com/openshift/ovn-kubernetes image-arm64 0276ba1ace90f6182fc13894fc17150262974be6 +https://github.com/openshift/ovn-kubernetes image-arm64 7e6b238838bc25c546022ba4ef3316fa98926d79 https://github.com/openshift/kubernetes image-arm64 91c24081f468e7636c824f4f5a2eb68660b81012 https://github.com/openshift/service-ca-operator image-arm64 30efb529a5b7db5d6f352f6ac0470d8385268539 From 5d069e31c3f470b91f8844807d2df6edcd69082a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 25 May 2026 04:16:50 +0000 Subject: [PATCH 3/5] update component images --- packaging/crio.conf.d/10-microshift_amd64.conf | 2 +- packaging/crio.conf.d/10-microshift_arm64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 5ceb87bd74..d2811c1319 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -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:8ebcd6745e15ac3776016a78fc9882f5ca05f5f6afbb5edd97edd70377f667d1" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae78a61a0ead49575f53116a122ff4cca54cd1973654076338407509d9702ee0" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index 12bc99f12c..e62772ca96 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -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:1f6231e8ab6c5f3064bd2463fad528d26c85a7c4b7bc22f29ab97326cb5cd72b" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bdbcbac5878b4e0c6e27d6fc2e6b349bcf08e7c2470b805dabad729e9a0eb4a" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 05d0940cdf41fe224362ca075b08bb5872bb5eca Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 25 May 2026 04:16:52 +0000 Subject: [PATCH 4/5] update manifests --- .../optional/multus/kustomization.aarch64.yaml | 4 ++-- .../optional/multus/kustomization.x86_64.yaml | 4 ++-- .../multus/release-multus-aarch64.json | 6 +++--- .../optional/multus/release-multus-x86_64.json | 6 +++--- .../kustomization.aarch64.yaml | 10 +++++----- .../kustomization.x86_64.yaml | 10 +++++----- .../release-olm-aarch64.json | 8 ++++---- .../release-olm-x86_64.json | 8 ++++---- assets/release/release-aarch64.json | 18 +++++++++--------- assets/release/release-x86_64.json | 18 +++++++++--------- 10 files changed, 46 insertions(+), 46 deletions(-) diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index 959802d35d..76c70e89ff 100644 --- a/assets/optional/multus/kustomization.aarch64.yaml +++ b/assets/optional/multus/kustomization.aarch64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:4357c8b38a201794e0323a71f51388382de57dfb0f2b4ebfec38a5f07439f3a6 + digest: sha256:e342c9d9acf841987b48461a69010612737177bde6ad22a3711bf7b9a52935a7 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:730cef562bfcb13ac64cba50a1efec6930899afde77892f9e2d3bdcfb247d7de + digest: sha256:d4f53aa744fae92415d49edb49b6cb584f2b322a848ac5d92d16dbfc2d092b8e diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index 7d88c150b6..4da82b34f0 100644 --- a/assets/optional/multus/kustomization.x86_64.yaml +++ b/assets/optional/multus/kustomization.x86_64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:6b894da705e0ba383443504701b4110ecdf5098581601f7393f60446c0fedf2b + digest: sha256:eaaf25d68200d8adcf984cf0887040decc95161a2eacc6dd0709ea7f4904689e - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:7ebd22fb19b406a24444d4427575931fdbdd620c272adbe7fb074d61180424a9 + digest: sha256:9d77719b154cfb043bd221f7195d348b713b56657b0cf9b596d4669f3d0f84a2 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 8c258be8ed..1ad30e015d 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2026-05-17-225756" + "base": "4.18.0-0.nightly-arm64-2026-05-25-004611" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4357c8b38a201794e0323a71f51388382de57dfb0f2b4ebfec38a5f07439f3a6", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:730cef562bfcb13ac64cba50a1efec6930899afde77892f9e2d3bdcfb247d7de" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e342c9d9acf841987b48461a69010612737177bde6ad22a3711bf7b9a52935a7", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4f53aa744fae92415d49edb49b6cb584f2b322a848ac5d92d16dbfc2d092b8e" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index e4bbb17c8d..096f93126e 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.18.0-0.nightly-2026-05-13-164455" + "base": "4.18.0-0.nightly-2026-05-24-133035" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b894da705e0ba383443504701b4110ecdf5098581601f7393f60446c0fedf2b", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ebd22fb19b406a24444d4427575931fdbdd620c272adbe7fb074d61180424a9" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eaaf25d68200d8adcf984cf0887040decc95161a2eacc6dd0709ea7f4904689e", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d77719b154cfb043bd221f7195d348b713b56657b0cf9b596d4669f3d0f84a2" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 7eb3a0e8b8..54ad85ae78 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:06db4a00a844be98658d15989203ca300e8ea2d7633d70c9c9e3e58e504702c4 + digest: sha256:2488de7fefb46c84910dedf65532895d60f40635b29a7aabfb88f92fd8c53d02 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:e64cb59c7e0bed255f669da28950112d3c395aa0fd3423052fd13528974c00d1 + digest: sha256:10f84a4722f18e78a4157e457d79848ca2c0fd9a73e7a26d3bbfd5244f0a7913 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:20601366d0aca42fd8cc3fd5fa6584e633217fad38d7c3c46ecd844548af4569 + digest: sha256:bb1b10ca1561f2b94d7133d4d727d44f8d08fa2e3bdba8070cb594705b0e0398 patches: - patch: |- @@ -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:e64cb59c7e0bed255f669da28950112d3c395aa0fd3423052fd13528974c00d1 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:10f84a4722f18e78a4157e457d79848ca2c0fd9a73e7a26d3bbfd5244f0a7913 - 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:06db4a00a844be98658d15989203ca300e8ea2d7633d70c9c9e3e58e504702c4 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2488de7fefb46c84910dedf65532895d60f40635b29a7aabfb88f92fd8c53d02 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 71536f8b19..9a592bc9a0 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:66f6a9bbdd24e7f6d1653cfdbcad28cc243793002308e1113095fbd1dc9f33b3 + digest: sha256:918bfbf3e8f83f63feec25ab52d4451493d5881096d73c1476a649be54ca0502 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:4c6bbba6992696aef1231e34a3652b244bca77d4d8d368d57cbc052ef16bfcaa + digest: sha256:b56c9f85389d5c6723b02076888c948f35858dd90b6aebea8d04010305571749 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:236b716621a88efd57cdf6f704340fb2faf4583651ecbda524261e0b5a9b39cf + digest: sha256:09545b6a940679a02e9cffbe9d4867944b71473bf9c9e5099591e17c7939ef06 patches: - patch: |- @@ -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:4c6bbba6992696aef1231e34a3652b244bca77d4d8d368d57cbc052ef16bfcaa + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b56c9f85389d5c6723b02076888c948f35858dd90b6aebea8d04010305571749 - 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:66f6a9bbdd24e7f6d1653cfdbcad28cc243793002308e1113095fbd1dc9f33b3 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:918bfbf3e8f83f63feec25ab52d4451493d5881096d73c1476a649be54ca0502 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 131007722c..bd3c0c58db 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2026-05-17-225756" + "base": "4.18.0-0.nightly-arm64-2026-05-25-004611" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:06db4a00a844be98658d15989203ca300e8ea2d7633d70c9c9e3e58e504702c4", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e64cb59c7e0bed255f669da28950112d3c395aa0fd3423052fd13528974c00d1", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20601366d0aca42fd8cc3fd5fa6584e633217fad38d7c3c46ecd844548af4569" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2488de7fefb46c84910dedf65532895d60f40635b29a7aabfb88f92fd8c53d02", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:10f84a4722f18e78a4157e457d79848ca2c0fd9a73e7a26d3bbfd5244f0a7913", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb1b10ca1561f2b94d7133d4d727d44f8d08fa2e3bdba8070cb594705b0e0398" } } diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index d67df68138..99ab6941e1 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.18.0-0.nightly-2026-05-13-164455" + "base": "4.18.0-0.nightly-2026-05-24-133035" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66f6a9bbdd24e7f6d1653cfdbcad28cc243793002308e1113095fbd1dc9f33b3", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c6bbba6992696aef1231e34a3652b244bca77d4d8d368d57cbc052ef16bfcaa", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:236b716621a88efd57cdf6f704340fb2faf4583651ecbda524261e0b5a9b39cf" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:918bfbf3e8f83f63feec25ab52d4451493d5881096d73c1476a649be54ca0502", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b56c9f85389d5c6723b02076888c948f35858dd90b6aebea8d04010305571749", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09545b6a940679a02e9cffbe9d4867944b71473bf9c9e5099591e17c7939ef06" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 1713c04718..46616e9efe 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2026-05-17-225756" + "base": "4.18.0-0.nightly-arm64-2026-05-25-004611" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6992d78c7a8ede741caeafbe4b1ae8962ba878762f50855608e33809f42c213", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1590c08790675b62452f104f57ffa5880caac7ec562ad5f3b77fe2910faa0e70", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25777eed2540ac34d0b945a41c852511f65260653478e6a91cd67a89e4d976b2", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20601366d0aca42fd8cc3fd5fa6584e633217fad38d7c3c46ecd844548af4569", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:61e9c065d72dd82e450b00ecce81c6f7a6ffd228d0351dab0509ea573dc893a8", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f6231e8ab6c5f3064bd2463fad528d26c85a7c4b7bc22f29ab97326cb5cd72b", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7d2a0b0769061df75adbdd2e719d9053fbd6db21fc042663935a45074b9a2dd", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af59c3d023f80a0d554bba0c5ff0dd8679722066a29f31f63a63270790aed878", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2bc4f4209b95a92d216020a359779b4f8b8a06a97e3fa6ad92d8ab10e020ba51", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:687452aa301ee8b66823986756207fcc817d804e74aafcb2901ca17563015364", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb1b10ca1561f2b94d7133d4d727d44f8d08fa2e3bdba8070cb594705b0e0398", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8bb2d6b2e89f4ef600c9a0fe9dcff4456020562dfcb39ca5d1afaa232ae7a8b", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bdbcbac5878b4e0c6e27d6fc2e6b349bcf08e7c2470b805dabad729e9a0eb4a", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ca9c66d79a6fe3521209c7158ecc79d74f6dfd8738dfe46233c4bc5107b85d7", "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:72f5255ffde22c9520f5312c29348a10ce2dc18da2d0915ad43b934b1f977a2a" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e179c5ffc420cab669aac832c58d65b336c84bc43c7d7cb946ae5b77cbb16586" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 31b899a30c..2de86742d5 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.18.0-0.nightly-2026-05-13-164455" + "base": "4.18.0-0.nightly-2026-05-24-133035" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fae8d6f288aa9b4dc6812d572c1d2acc6cd4d85b17bf9d73fb723b2104f8708f", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc59b3d720c2e8240087d7bae474b618ad810d163afd2072bb9c95cf83dd71cc", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2804591b8bc70f5d4c8f94d722de4fb9d01de1bcf329c05b4a31577b6741bd4d", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:236b716621a88efd57cdf6f704340fb2faf4583651ecbda524261e0b5a9b39cf", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c4f9f69f15fb925664055c24a38b143eb4a7ad92864b4b2193a74d735c6f975", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ebcd6745e15ac3776016a78fc9882f5ca05f5f6afbb5edd97edd70377f667d1", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:187f9b0a3870f29230341708af35ab9befe217fb7d5c9c0aa663a365175b3f83", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c240c27ce04bfa69395b36164f425727624e146a68aa2c9ca6c5c2be485b7731", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e82897d1c08065a55303527f8ca2e899035c15b633b7f86cf83993f443cfbf8", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a39b26a8362623ba07a6f49ac06184532d571c79cb449009dbee230c3558402d", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09545b6a940679a02e9cffbe9d4867944b71473bf9c9e5099591e17c7939ef06", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:615f143518d5debba57aec59010af18d62d357d145303e0ad7f9d565d1f65de6", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae78a61a0ead49575f53116a122ff4cca54cd1973654076338407509d9702ee0", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdc1edb4794dd0bcd87a7d38edf894236d3f78f2a4c9f1e6ca51418321b79e51", "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:8657b9eca6df33d652c05c4ca594236aa42277ed5d83b7757748be262f2ffd1f" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c13ebf430a23e7c5b627d3710f1fb87b1b608a8db2648d913c2ffc237f8649b2" } } From 42f2ed97a31de884ad422d6d4d544de32058cafc Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 25 May 2026 04:16:55 +0000 Subject: [PATCH 5/5] update buildfiles --- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 156591dbe3..9ddd8a6ff4 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-arm64-2026-05-17-225756 +OCP_VERSION := 4.18.0-0.nightly-arm64-2026-05-25-004611 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 79e5a06d05..e0710cf14b 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-2026-05-13-164455 +OCP_VERSION := 4.18.0-0.nightly-2026-05-24-133035