Skip to content

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-01-13-114945_amd64-2025-01-13_arm64-2025-01-14 #4415

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
merged 5 commits into from
Jan 15, 2025
Merged

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-01-13-114945_amd64-2025-01-13_arm64-2025-01-14 #4415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e985428
update last_rebase.sh
Jan 15, 2025
2df3e53
update changelog
Jan 15, 2025
7f735f7
update component images
Jan 15, 2025
8a1838b
update manifests
Jan 15, 2025
0a86647
update buildfiles
Jan 15, 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-01-13-174945
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-01-14-173318
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-01-13-174945"
"base": "4.18.0-0.nightly-arm64-2025-01-14-173318"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05394287fd690e589778264f7272c968e4cf87137005272af48082729d35c5af",
Expand Down
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2025-01-13-174945"
"base": "4.18.0-0.nightly-arm64-2025-01-14-173318"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb8a571aaacdbc3653d4a6b93e3e854c7f4bb8ccc4b50d47eca0df178dd935e3",
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2025-01-13-174945"
"base": "4.18.0-0.nightly-arm64-2025-01-14-173318"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e97a1610f2cca76626c497f02401518309e3c323d113d4c5eed2aced9a8f895",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f8ab04d2eae86d44d8061bf14662b42e3dfe3718fb08ae1259f94900d5c4bc5",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ebf06deb7ce22e50a5c66be3c52674eb53337e967fe7397f7e8327c784ca49b",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03f1644f600af057ccf8ae3fd544d6a0dc72f079f97f9db98e00ed8c9779c26d",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc34ba5a77e872e2a7b9918166f522ea22154f87738e34f65acc0fdc4c2e5a30",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2175ea09614a38845e1bfaf139655c0cc7110739b5acebd6d89242bb3cf7dfed",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b8548a3a65394f4e82397fd759a0a80a77d41c875f2db817d8034e5bd3848bf",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49f294bfc07141d8d238566373651845cc5137dcf93f9de2029b448d79b26235",
"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:610c51e225c86c53aa1a30fd354f744e1e62a7578169f161969522fe88c27af4",
Expand Down
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_arm64.conf
View file
Open in desktop
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:2175ea09614a38845e1bfaf139655c0cc7110739b5acebd6d89242bb3cf7dfed"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b8548a3a65394f4e82397fd759a0a80a77d41c875f2db817d8034e5bd3848bf"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
5 changes: 5 additions & 0 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- kubernetes image-arm64 205ac00c56dd2340b90dc0e328be84e77219197c to d93c78ae6fd13542228ed371626bee3c3e8d7e91
- 5d18fcd9c 2024-12-11T15:40:47+00:00 UPSTREAM: <carry>: require configuration file enablement
- a2bc30e98 2024-12-11T15:40:46+00:00 UPSTREAM: 126750: update comments
- 08daca616 2024-12-11T15:40:46+00:00 UPSTREAM: 126750: Add takeByTopologyUnCoreCachePacked if policy option align-cpus-by-uncorecache is enabled. Adding new function to evaluate uncore cache id. Reverse allocation logic. Implement preferAlignByUncorecache within TakeByTopologyNUMAPacked, along with new test cases.

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 @@ -33,5 +33,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 f52ce8b8b0799a
https://github.com/openshift/router image-arm64 be319d0bb83f75b52b707df46422f6892dfaaa56
https://github.com/openshift/kube-rbac-proxy image-arm64 526498ab32996a0f67a96530ad7173f955e3fbe2
https://github.com/openshift/ovn-kubernetes image-arm64 930d8645c00fd2273c4cbb6e1d3c057e0967f0a1
https://github.com/openshift/kubernetes image-arm64 205ac00c56dd2340b90dc0e328be84e77219197c
https://github.com/openshift/kubernetes image-arm64 d93c78ae6fd13542228ed371626bee3c3e8d7e91
https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755
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-01-13-114945" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-01-13-174945"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-01-13-114945" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-01-14-173318"