Skip to content

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-06-13-163946_amd64-2025-06-13_arm64-2025-06-13 #5064

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
Jun 16, 2025
Merged

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-06-13-163946_amd64-2025-06-13_arm64-2025-06-13 #5064

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
eecbe24
update last_rebase.sh
Jun 16, 2025
4fc3d0f
update changelog
Jun 16, 2025
1e3eb74
update manifests
Jun 16, 2025
e2b304f
update buildfiles
Jun 16, 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-11-191738
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-06-13-163947
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-11-180536
OCP_VERSION := 4.18.0-0.nightly-2025-06-13-163946
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-11-191738"
"base": "4.18.0-0.nightly-arm64-2025-06-13-163947"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aea58653822092746bc5e24bc47522ef5dff6413e76003ae31c6f0143a78fc04",
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-11-180536"
"base": "4.18.0-0.nightly-2025-06-13-163946"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55dd6d779d98c33cb0fd2a478ec357397ca7d6d4ee0bd4673aa96d66d3d06965",
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:deebd7735f67e9289eb36e7621eaf357e47cabb52ddc617d4ac61969cafb7a74
digest: sha256:e994ecdfd3a6d87fd174cf8c78cea4b64fd4c6ad02b264f1e01294eb97da8267
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:9b8daf99abb06963fd2f20bb59c6ae8808fdf7bd0ceb2f73adfeaee8baa63d8e
digest: sha256:e4003530e25137f8673b57205307e08498b5bd53dea642daecc0f6197bcbd8dc
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:2c40c252fb0e41a554402c9055b5d8951c5feecfbd5ec25de6165a5edf00a8a3
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:9b8daf99abb06963fd2f20bb59c6ae8808fdf7bd0ceb2f73adfeaee8baa63d8e
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e4003530e25137f8673b57205307e08498b5bd53dea642daecc0f6197bcbd8dc
- 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:deebd7735f67e9289eb36e7621eaf357e47cabb52ddc617d4ac61969cafb7a74
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e994ecdfd3a6d87fd174cf8c78cea4b64fd4c6ad02b264f1e01294eb97da8267
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:fbe2341dab9955d9af2dbea79d1beb8837a2701c0d0f8bcec9e8bbed20b37683
digest: sha256:2a00838aabeb7a4559455fbe2249f77de66f990d1218ba28742c6da951d0f782
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:bf9d714b5e0bb50e83a104238b716bc00aad92a519c508e21a2dee9ac4de347d
digest: sha256:d423cd98c3fcc4f9aee26e34880955be2ce0e2d29f53b577ac4cca7164e981d7
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:0911beebdfb3b798192a70bf74397fdcf5ea15fa5bbf8843350ac3cdc0f5b0fb
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:bf9d714b5e0bb50e83a104238b716bc00aad92a519c508e21a2dee9ac4de347d
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d423cd98c3fcc4f9aee26e34880955be2ce0e2d29f53b577ac4cca7164e981d7
- 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:fbe2341dab9955d9af2dbea79d1beb8837a2701c0d0f8bcec9e8bbed20b37683
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2a00838aabeb7a4559455fbe2249f77de66f990d1218ba28742c6da951d0f782
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-11-191738"
"base": "4.18.0-0.nightly-arm64-2025-06-13-163947"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:deebd7735f67e9289eb36e7621eaf357e47cabb52ddc617d4ac61969cafb7a74",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9b8daf99abb06963fd2f20bb59c6ae8808fdf7bd0ceb2f73adfeaee8baa63d8e",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e994ecdfd3a6d87fd174cf8c78cea4b64fd4c6ad02b264f1e01294eb97da8267",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e4003530e25137f8673b57205307e08498b5bd53dea642daecc0f6197bcbd8dc",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c40c252fb0e41a554402c9055b5d8951c5feecfbd5ec25de6165a5edf00a8a3"
}
}
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-11-180536"
"base": "4.18.0-0.nightly-2025-06-13-163946"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fbe2341dab9955d9af2dbea79d1beb8837a2701c0d0f8bcec9e8bbed20b37683",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf9d714b5e0bb50e83a104238b716bc00aad92a519c508e21a2dee9ac4de347d",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2a00838aabeb7a4559455fbe2249f77de66f990d1218ba28742c6da951d0f782",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d423cd98c3fcc4f9aee26e34880955be2ce0e2d29f53b577ac4cca7164e981d7",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0911beebdfb3b798192a70bf74397fdcf5ea15fa5bbf8843350ac3cdc0f5b0fb"
}
}
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-11-191738"
"base": "4.18.0-0.nightly-arm64-2025-06-13-163947"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4427240d5772ccdefb90d2ba8d49a6ab28d6b9b85e9871724340d5176b059b8",
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-11-180536"
"base": "4.18.0-0.nightly-2025-06-13-163946"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f2a2833c542e117756b2b18e4f51c65cf539ff2d8b6d7e522b369c0bc3c19587",
Expand Down
19 changes: 2 additions & 17 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
- kubernetes embedded-component e6e35d04f5019d8b85207d37cfa2efc0db18925a to db4023c383e559c6310710cd16a441912fc9c06f
- 151e2cdba 2025-06-02T15:22:13-04:00 UPSTREAM: <carry>: kubelet: fix a stall on startup from waiting too long for a stat call

- kubernetes-kube-storage-version-migrator embedded-component 50d17147f15d8b216e7c41f91d1bd7d307ca8c73 to 8dec42d36f9e26487112aeac870767a5fedb8021
- 5468ab7 2025-06-09T17:20:26-04:00 append .0 to go.mod version

- coredns image-amd64 cb1abfaeb7b0c5df4f0c56b0a009b439db1d0949 to eb75d9b4f41a5ce0258d6f245c6206715ecb283b
- c85c7d4 2025-06-09T11:17:59-04:00 append .0 to go.mod version

- kubernetes image-amd64 e6e35d04f5019d8b85207d37cfa2efc0db18925a to db4023c383e559c6310710cd16a441912fc9c06f
- 151e2cdba 2025-06-02T15:22:13-04:00 UPSTREAM: <carry>: kubelet: fix a stall on startup from waiting too long for a stat call

- coredns image-arm64 cb1abfaeb7b0c5df4f0c56b0a009b439db1d0949 to eb75d9b4f41a5ce0258d6f245c6206715ecb283b
- c85c7d4 2025-06-09T11:17:59-04:00 append .0 to go.mod version

- kubernetes image-arm64 e6e35d04f5019d8b85207d37cfa2efc0db18925a to db4023c383e559c6310710cd16a441912fc9c06f
- 151e2cdba 2025-06-02T15:22:13-04:00 UPSTREAM: <carry>: kubelet: fix a stall on startup from waiting too long for a stat call
- operator-framework-olm embedded-component d83b7565606cc984396860212bb60bdfd1ed578a to 969a7e031a97a7e12424b5d292f345a168b73e38
- 97113876 2025-06-11T07:03:04+00:00 operatorgroup: ensure clusterroleselectors in clusterrole aggregation rules are sorted (#3593)

2 changes: 1 addition & 1 deletion scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ https://github.com/openshift/kubernetes embedded-component db4023c383e559c631071
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 8dec42d36f9e26487112aeac870767a5fedb8021
https://github.com/openshift/machine-config-operator embedded-component efe259e04ba98784102ba603941ecbbb75233c6b
https://github.com/openshift/openshift-controller-manager embedded-component 214c4c29bacb8260a80cce7a39534a16d92eda42
https://github.com/openshift/operator-framework-olm embedded-component d83b7565606cc984396860212bb60bdfd1ed578a
https://github.com/openshift/operator-framework-olm embedded-component 969a7e031a97a7e12424b5d292f345a168b73e38
https://github.com/openshift/route-controller-manager embedded-component ce6ffa24dac3a5f49f70818e1159e40eaf27a6a3
https://github.com/openshift/service-ca-operator embedded-component 30efb529a5b7db5d6f352f6ac0470d8385268539
https://github.com/openshift/oc image-amd64 903a973ce8f8b4509b5158b95bcebe9209e29761
Expand Down
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-2025-06-11-180536" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-06-11-191738"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-06-13-163946" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-06-13-163947"