Skip to content

NO-ISSUE: rebase-4.14.0-0.nightly-2024-06-19-070718_amd64-2024-06-19_arm64-2024-06-19 #3517

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

NO-ISSUE: rebase-4.14.0-0.nightly-2024-06-19-070718_amd64-2024-06-19_arm64-2024-06-19 #3517

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
6ac1868
update last_rebase.sh
Jun 20, 2024
f06910e
update changelog
Jun 20, 2024
23ac2b3
update component images
Jun 20, 2024
1385443
update manifests
Jun 20, 2024
3592e58
update buildfiles
Jun 20, 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-18-181939
OCP_VERSION := 4.14.0-0.nightly-arm64-2024-06-19-065658
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-18-114150
OCP_VERSION := 4.14.0-0.nightly-2024-06-19-070718
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.14.0-0.nightly-arm64-2024-06-18-181939"
"base": "4.14.0-0.nightly-arm64-2024-06-19-065658"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ad0928d592f3046445b968dfaf8f7e8fb7713e58a3f41d8b53ce62bcf5d85dc",
Expand Down
20 changes: 10 additions & 10 deletions assets/release/release-x86_64.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-2024-06-18-114150"
"base": "4.14.0-0.nightly-2024-06-19-070718"
},
"images": {
"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",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8821eedd639928d59d102e19b8fe35de308a276e8d25a984fa755af7db4bf99e",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ff2c3e79c9205a20033550232f9581fb59167bf243f196788186be9063dc5d8",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e427561b2fed25d08f99bbecc44f423682ed69e9559f1e229bfff67cb1d9c1f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d034bfb08a30dac2a20c55a4a91b6851823ba2696a70981d900607f6f248ff91",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ca250f7a59f6c3262e6d32244d893f5264a1677d392196ab88facf13f7e21d3",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:937f9ec273be01442ccabb69fce876440ade16598bfd9879c6ff97cbe8a635be",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53cdb9dbbc53a93861f725ea08a2c8574cdd8e9ff3e7dfd843877758dc571263",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db12b3251e7c62012e2efab57ffe2acd2060c397e3deb261734bfaae2d25a3fb",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:202b944f358f18143a94340a8148715ee4ef482a32385b111fb2deb6bc277335",
"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:d3510003c5ebcb28be2825641599617e04170998090878fa62ed07661ba3dc63",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:409f60bdf11430c0b34def19129fe6cc0f1402fbd25a800ad0c9276abfd82871",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc9de32fa8db9a7025f651fc607427f226b78526beda1c385e60270a8b941a3d"
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22bc5e4e43e1a2be1dcb0202a749204ada3aeda9527723ce0f2b3e8e0962e96f",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9774e1d363a7490a21801d9ad38184559d5b5df60dc6fd6642098093e4c85209",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7089aba41682ba99eb9610dd88249fe08d5c07c8d872cba836c66b7ca71f4f7"
}
}
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/microshift_amd64.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:937f9ec273be01442ccabb69fce876440ade16598bfd9879c6ff97cbe8a635be"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db12b3251e7c62012e2efab57ffe2acd2060c397e3deb261734bfaae2d25a3fb"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
3 changes: 0 additions & 3 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
- 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/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-18-114150" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-06-18-181939"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-06-19-070718" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-06-19-065658"