Skip to content

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-06-30-210820_amd64-2025-06-30_arm64-2025-06-30 #5129

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
Jul 3, 2025
Merged

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-06-30-210820_amd64-2025-06-30_arm64-2025-06-30 #5129

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
85c82be
update last_rebase.sh
Jul 3, 2025
7c5499d
update changelog
Jul 3, 2025
7d15bce
update manifests
Jul 3, 2025
bb21053
update buildfiles
Jul 3, 2025
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-2025-06-28-192014
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-06-30-210820
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.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-2025-06-28-192013
OCP_VERSION := 4.18.0-0.nightly-2025-06-30-210820
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-2025-06-28-192014"
"base": "4.18.0-0.nightly-arm64-2025-06-30-210820"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:82a7423a704ace49aae917d7e8f84e593070ab435ca9da3b81b7d0d3f2569838",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-x86_64.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-2025-06-28-192013"
"base": "4.18.0-0.nightly-2025-06-30-210820"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3292c5d36598b0e8211f4d14a1e962097b737134e764030661a26e2c69ba7950",
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:f624b7b9d37b3cc43480ddc1acdfc2f6740f0d43f96622e7749639319addbeb9
digest: sha256:f36bfdef2211f083e38b9ee6b8d0c903287304bf2b5e247e0fab498b0f1a07a2
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:9663b452a4a09fdb65bfb13cd58fadc678f844185ac96d67047fe376a4ef3471
digest: sha256:c38d95a36eaab5739e861de48fdda348995ddf4ee5b685c6872caaec9cdba7e5
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:136c4dd85cd884a3c191a2ad85e9064597acb4f96c3902ca958a42b52742b481
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:9663b452a4a09fdb65bfb13cd58fadc678f844185ac96d67047fe376a4ef3471
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c38d95a36eaab5739e861de48fdda348995ddf4ee5b685c6872caaec9cdba7e5
- 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:f624b7b9d37b3cc43480ddc1acdfc2f6740f0d43f96622e7749639319addbeb9
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f36bfdef2211f083e38b9ee6b8d0c903287304bf2b5e247e0fab498b0f1a07a2
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.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:6cba0d041d22c4b99c402da085c617d9103b89ce9471a876aa61a5a51314cd05
digest: sha256:a659790a0c97d83e07303cb25849870cb229e8df5ca93f7b69d2c8af8bec8046
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:cb8edecf4c19f0d59372f2027853229bba7354ab9babaed28d51da285c40da16
digest: sha256:fcdb940b14424e51f7ea0c4e5a899528fe722a55b630ffe7b6d697359f2c6ddb
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:a4606efa39f5046fe06fc0ccff329291620f439226f7e7b1530ef7978cc2d9ca
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:cb8edecf4c19f0d59372f2027853229bba7354ab9babaed28d51da285c40da16
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcdb940b14424e51f7ea0c4e5a899528fe722a55b630ffe7b6d697359f2c6ddb
- 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:6cba0d041d22c4b99c402da085c617d9103b89ce9471a876aa61a5a51314cd05
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a659790a0c97d83e07303cb25849870cb229e8df5ca93f7b69d2c8af8bec8046
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-2025-06-28-192014"
"base": "4.18.0-0.nightly-arm64-2025-06-30-210820"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f624b7b9d37b3cc43480ddc1acdfc2f6740f0d43f96622e7749639319addbeb9",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9663b452a4a09fdb65bfb13cd58fadc678f844185ac96d67047fe376a4ef3471",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f36bfdef2211f083e38b9ee6b8d0c903287304bf2b5e247e0fab498b0f1a07a2",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c38d95a36eaab5739e861de48fdda348995ddf4ee5b685c6872caaec9cdba7e5",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:136c4dd85cd884a3c191a2ad85e9064597acb4f96c3902ca958a42b52742b481"
}
}
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.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-2025-06-28-192013"
"base": "4.18.0-0.nightly-2025-06-30-210820"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6cba0d041d22c4b99c402da085c617d9103b89ce9471a876aa61a5a51314cd05",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb8edecf4c19f0d59372f2027853229bba7354ab9babaed28d51da285c40da16",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a659790a0c97d83e07303cb25849870cb229e8df5ca93f7b69d2c8af8bec8046",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcdb940b14424e51f7ea0c4e5a899528fe722a55b630ffe7b6d697359f2c6ddb",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4606efa39f5046fe06fc0ccff329291620f439226f7e7b1530ef7978cc2d9ca"
}
}
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-2025-06-28-192014"
"base": "4.18.0-0.nightly-arm64-2025-06-30-210820"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0475d64ba6eb95caa3e5eb188cd13dba82548f4774dfaecc694ccb0ceb144898",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.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-2025-06-28-192013"
"base": "4.18.0-0.nightly-2025-06-30-210820"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9af44e96140328139d74de2166b57ebbefaf0872745be8c56364a6280206793",
Expand Down
Loading