Skip to content

NO-ISSUE: rebase-4.14.0-0.nightly-2024-05-08-232852_amd64-2024-05-08_arm64-2024-05-09 #3341

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 5 commits into from
May 10, 2024
Merged

NO-ISSUE: rebase-4.14.0-0.nightly-2024-05-08-232852_amd64-2024-05-08_arm64-2024-05-09 #3341

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
b173df8
update last_rebase.sh
May 10, 2024
be98d83
update changelog
May 10, 2024
b0ad496
update component images
May 10, 2024
b3c2fc5
update manifests
May 10, 2024
e4bc691
update buildfiles
May 10, 2024
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.14.0-0.nightly-arm64-2024-05-09-000637
OCP_VERSION := 4.14.0-0.nightly-arm64-2024-05-09-233233
20 changes: 10 additions & 10 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"release": {
"base": "4.14.0-0.nightly-arm64-2024-05-09-000637"
"base": "4.14.0-0.nightly-arm64-2024-05-09-233233"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5cc92ef6ae3d99adeb12014bf4cbb4860cdf07d716b49ae9b4a1ea07c379502e",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d1a0dc42459ebbda1cb51f7e54687f307f8e5a2b95fde17a7620ac5b2823f128",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cab2788b7f619cbed7538b4e264ede24ac10db45f7ed8a6058f0544504bf093f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dae580301abc5601ce76c41095f47b287abf2a3b8d6bf8d56ff19d5b976d42b4",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffef47121cd690f3b2016cb94af8b2014aac50cc378cfdab9e27591c621288b3",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf1dbdaecb113ca7da070787b624df2d4047e431ffb9f9a20960e26c0bc059cb",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:406f0b4cbe70650684dc44eaf39c12e6985e7c54cc4004d24efcb323f4887e66",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2fff86d25e63f96eee91431a583a26cb82a811503f8b0d96815d588bb8417042",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42d8165730e24e6a4b120cee0567eb724d34e2ec4eaa1070a8ad80eb779c474f",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9542b4d7a6a0431167574efaa4a64520ac0b2d21fb6f6693a307c53bf8036982",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c50130f765bdf0e397a6b8d52e396b7847adf4f62dab0bef5af8649d8b870e08",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4efd6f159326c742f4854a2ce52b3983ac58b6ef9861345fa8852a92f8499df",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c10dc91646e61dfb0c3222f39184bdaf7b2375a5190cd83782366b2cd8a1379",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:caa0bbab808d8cbed476e8fa3e296ceb90f8d7d253e36588fa77e639ea389d55",
"topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:829a8e4d34404abbd22fddb6ebfa0f74daa55f2697fb147da77b83fc8b473d8c",
"topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:7ee0257998b7f804fcde9c095b4dc240c510eb316d7223e8485f701b5c9f2fbf",
"topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:b453a5c76ba4e975a978e31a51531b1d6233723b0d944622caf7844dedf9ad5a",
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4bb49330820af1b42a2314fac03199c3b3852c380d2c0b14cae6c2fdec90a3d6",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c8de1146192a9dca451c14a0f9e2483519f6ad5f4392b762163c5806d7024fcb",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0b836edc0d2ded4e7abc8be0f43ab8c06d7d1aadf35d02d7181dce3fde9715e"
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4f91117d557baa433da7b80be16d2956c6414012a034a5631ecab737995c828",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:415341fcda63e92e1abb4c5f80e077beb899fbf113e20fa4a43fd51387aea245",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53bc14e163a920b5609febb3f87efd84adef3e89ff40d633ed3ea261b2016642"
}
}
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/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:9542b4d7a6a0431167574efaa4a64520ac0b2d21fb6f6693a307c53bf8036982"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4efd6f159326c742f4854a2ce52b3983ac58b6ef9861345fa8852a92f8499df"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
3 changes: 3 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,3 @@
- router image-arm64 e1e59b3337700e2b94c8d5c5e5414519f9785614 to e17abdff0095edee65e3be926f98b758aa3c87bb
- f0ad69e 2024-05-08T07:45:09+00:00 OCPBUGS-29690: Count active services before setting weight to 1

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 @@ -30,7 +30,7 @@ https://github.com/openshift/coredns image-arm64 7d3fa777871ed2e5a70715e7f3e71d3
https://github.com/openshift/csi-external-snapshotter image-arm64 a6834536936b16dcd9ee81a8753a2ef6dc208541
https://github.com/openshift/csi-external-snapshotter image-arm64 a6834536936b16dcd9ee81a8753a2ef6dc208541
https://github.com/openshift/csi-external-snapshotter image-arm64 a6834536936b16dcd9ee81a8753a2ef6dc208541
https://github.com/openshift/router image-arm64 e1e59b3337700e2b94c8d5c5e5414519f9785614
https://github.com/openshift/router image-arm64 e17abdff0095edee65e3be926f98b758aa3c87bb
https://github.com/openshift/kube-rbac-proxy image-arm64 1a646b98d8864e53accb726531d86f084ab13977
https://github.com/openshift/ovn-kubernetes image-arm64 255b35826c736426a2f39ea1bbc72adeb19cf1e6
https://github.com/openshift/kubernetes image-arm64 fd36fb9acf9a99270f4fca3f5817fd52c8bc58b4
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.14.0-0.nightly-2024-05-08-232852" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-05-09-000637"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-05-08-232852" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-05-09-233233"