Skip to content

NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-07-20-191204_amd64-2024-07-20_arm64-2024-07-24 #3680

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
Jul 25, 2024
Merged

NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-07-20-191204_amd64-2024-07-20_arm64-2024-07-24 #3680

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
39559b6
update last_rebase.sh
Jul 25, 2024
f8a21cb
update changelog
Jul 25, 2024
6c73b84
update component images
Jul 25, 2024
6a57836
update manifests
Jul 25, 2024
58dd51e
update buildfiles
Jul 25, 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.17.0-0.nightly-arm64-2024-07-23-221753
OCP_VERSION := 4.17.0-0.nightly-arm64-2024-07-24-205626
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.17.0-0.nightly-arm64-2024-07-23-221753"
"base": "4.17.0-0.nightly-arm64-2024-07-24-205626"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fba91b43df563fcdbe7e448e39310e293add75bc414718e5f1f9b0363037fd94",
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.17.0-0.nightly-arm64-2024-07-23-221753"
"base": "4.17.0-0.nightly-arm64-2024-07-24-205626"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6bd9b176b68dc1a4f697144d23d836eac7b6b7404e1081c54b38372a1660f236",
Expand Down
6 changes: 3 additions & 3 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-07-23-221753"
"base": "4.17.0-0.nightly-arm64-2024-07-24-205626"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac0f45732c2c19b639f70b1d8d980a41264ccebca23d482252b53d52e18cf461",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e93426baff45fd6a846a9d105784650b5934d1ecf85d645c829300df86370f5c",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed63cf399a60fce79d0cb1cffd0e745e02d932a84f619a0fb9a48d4bfa72d669",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9edfbdbfadc0a286347f0020acbe6ebf4c98c188b413a45b53b54d5484f1105",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5de61136730951091e1519e17303554255c4d87393eefff1e0f82e806214e925",
"openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d7ea0408c1fcf875d36896369b584c0ac93e7727f7e26637751f1bdbb58ce91",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e39993a3101ffcb6e6a83866bc4aa8a04741ee696333047cd318e60c61aba661",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:351d3f53d78c9feb69d0d6402532014b24a1ff42b905d3aaeff7cb3df0b154fc",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8421b56e4f68e78f16bc5f739c8fc12d454998e9ae6c396f38e2dd3a9a7b68e",
"lvms_operator": "quay.io/lvms_dev/lvms4-lvms-rhel9-operator@sha256:1901bc1f4affaf9db870dd6eaea6eb5d0a33eb60aaca2ed12253b48ceafa2d90",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:acb7b287df7a261f46c5e692a2d63dd21ca40b0b6f8ceb131b55d601f0e17e7d",
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:e39993a3101ffcb6e6a83866bc4aa8a04741ee696333047cd318e60c61aba661"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:351d3f53d78c9feb69d0d6402532014b24a1ff42b905d3aaeff7cb3df0b154fc"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
180 changes: 4 additions & 176 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 8ea2c994df4296ec161023d
https://github.com/openshift/ovn-kubernetes image-amd64 9168abf8a94cbd83a7fd53fc675fb42afea870ea
https://github.com/openshift/kubernetes image-amd64 1bead22a2ef091d421bbe4e455799fac869c3c80
https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755
https://github.com/openshift/oc image-arm64 5fc681242a24e146ac67b7be2d2ba909f833b3b0
https://github.com/openshift/oc image-arm64 19e7c3998335e1b3f0153fec82a8a81e04c45634
https://github.com/openshift/coredns image-arm64 d3b441c150ccbcc0d9ebf03b8c39a730b830ddb1
https://github.com/openshift/csi-external-snapshotter image-arm64 6ae55b8749a2fd9011d2c75d5f428f36e93be512
https://github.com/openshift/csi-external-snapshotter image-arm64 6ae55b8749a2fd9011d2c75d5f428f36e93be512
https://github.com/openshift/router image-arm64 a7313722c6e0541fcc00e92c459dd5d32a4a1534
https://github.com/openshift/kube-rbac-proxy image-arm64 8ea2c994df4296ec161023d8ff85f9ea0e383216
https://github.com/openshift/ovn-kubernetes image-arm64 9168abf8a94cbd83a7fd53fc675fb42afea870ea
https://github.com/openshift/kubernetes image-arm64 1bead22a2ef091d421bbe4e455799fac869c3c80
https://github.com/openshift/kubernetes image-arm64 32f817d75efea03f9baf659eaf373569c4d85f56
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.17.0-0.nightly-2024-07-20-191204" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-07-23-221753"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-07-20-191204" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-07-24-205626"