Skip to content

NO-ISSUE: rebase-4.14.0-0.nightly-2024-06-18-114150_amd64-2024-06-18_arm64-2024-06-18 #3507

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
Jun 19, 2024
Merged

NO-ISSUE: rebase-4.14.0-0.nightly-2024-06-18-114150_amd64-2024-06-18_arm64-2024-06-18 #3507

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
c9c9366
update last_rebase.sh
Jun 19, 2024
736df71
update changelog
Jun 19, 2024
cc3d5f1
update component images
Jun 19, 2024
5e98c62
update manifests
Jun 19, 2024
a5e78db
update buildfiles
Jun 19, 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-06-17-112429
OCP_VERSION := 4.14.0-0.nightly-arm64-2024-06-18-181939
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.14.0-0.nightly-2024-06-14-081235
OCP_VERSION := 4.14.0-0.nightly-2024-06-18-114150
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-06-17-112429"
"base": "4.14.0-0.nightly-arm64-2024-06-18-181939"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:292a5b39838be626fea52c0179a2dc41e76d58447f3b18d62f3f2f5f30549325",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6624ec8007ffa9f465e197d9de555a5d9f1acf1b05ba2d0bab013088217aabed",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:561b837414cfa4871bf5660062fc0d964d04120cbec6d28d22342a8a3ead6661",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:54af87eb207b7f05def68326cdb7f4e03ba766312b60e6e41a433beb5c84de37",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ad0928d592f3046445b968dfaf8f7e8fb7713e58a3f41d8b53ce62bcf5d85dc",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17d86d44fcf9c9077266950628edb200f9c38c39c737354a70cd5d5f503b06c9",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdb9d1959fcb2c7a3a9ba0fbd3e55122b9ac943f2722f92bd51438cd5307e361",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20fcb945b3963202d78d7bc8486c436e1420be38155cd769d5b09169cd0898cd",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01b824638a4a2635da690a2ecb6a894b61dece8beac4ece82d025be2c1c24a64",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b2bb8fff65b3d4c6ec8fe416c26415b78c17cbd3daafe9b5413ec9dc6e61016",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b4477fce03efd3ab3220f53e5668a115e72aca29757c2f87a56965994b5c697",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f53e66590654af80d99a95c178a9fba7cd1186451a2f8beadea1c15ca5a4ad8d",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:de32264e67b7d9d3b5c25c9183408b5de9bf794b12960e426a8cf9238e5f60db",
"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:7a3c302f85a23a02d8045140bc27c69d9f32ec6d63541e354803ce3a8e6a6a46",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35aaa647d588d359a7edb05edbc1bbb87437b1efbaa2e24d8f4ef448ea8641ed",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcdfd6ce1063f367f5d6ccc1e6c7e7b13fce81de94a88443420442dd68c3990c"
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b1d22aa345170a03213de38362efb29b525d4b4819300fe4fe7ba286b8c2794",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a217b6d7b6f3b291ddaf00f77fb32b8a98b60e831d0ed425dc53be7182f9a39f",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:356a47591608e666a01968329cf4511ab1faf28a42898188f2e6bb9e73341709"
}
}
4 changes: 2 additions & 2 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.14.0-0.nightly-2024-06-14-081235"
"base": "4.14.0-0.nightly-2024-06-18-114150"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3dd75913ad28f9fbe073aa6b4a4395d983576cb6baa3b951c45a80b721bbc0b",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc15dd65145538ffc6875558e2b9752261d94fc59b82242b9875cd1cdc95e2f3",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60eaf6b3d575c07ae9cd6326a7effc11bfd56eeec96b6b8cd1323a87fda6f046",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b78845bccd91ae5fdb91fb0d203453147ba3afa93220fb6aa40f3d8baa8d53d3",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:600c03493940c25ae3381c9a6ffb7f18f67e1601ba20302e460cc4a1ef132216",
Expand Down
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:7b2bb8fff65b3d4c6ec8fe416c26415b78c17cbd3daafe9b5413ec9dc6e61016"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f53e66590654af80d99a95c178a9fba7cd1186451a2f8beadea1c15ca5a4ad8d"
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 @@
- oc image-amd64 f7b14a92857ad1f28be2e2eaec3ae8229d4c2761 to aa6e2f22f0c7e46757d976b6eb003786196ff907
- d0be9d13 2024-06-13T13:33:41-05:00 bump go-git to v5.11.0

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 @@ -15,7 +15,7 @@ https://github.com/openshift/machine-config-operator embedded-component 3aec7f32
https://github.com/openshift/openshift-controller-manager embedded-component 27209ef14fcfca236ddba24ac7289bb3d01be8e6
https://github.com/openshift/route-controller-manager embedded-component 1a5e72f41b21f5ebcd6f9dd8227d92ad1fffbb1e
https://github.com/openshift/service-ca-operator embedded-component 3c3f82f7112ee4b5656e5c554f9887acdf881175
https://github.com/openshift/oc image-amd64 f7b14a92857ad1f28be2e2eaec3ae8229d4c2761
https://github.com/openshift/oc image-amd64 aa6e2f22f0c7e46757d976b6eb003786196ff907
https://github.com/openshift/coredns image-amd64 7d3fa777871ed2e5a70715e7f3e71d3f01785330
https://github.com/openshift/csi-external-snapshotter image-amd64 a6834536936b16dcd9ee81a8753a2ef6dc208541
https://github.com/openshift/csi-external-snapshotter image-amd64 a6834536936b16dcd9ee81a8753a2ef6dc208541
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-06-14-081235" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-06-17-112429"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-06-18-114150" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-06-18-181939"