Skip to content

NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-05-24-193308_amd64-2024-05-24_arm64-2024-06-04 #3437

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 4 commits into from
Jun 5, 2024
Merged

NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-05-24-193308_amd64-2024-05-24_arm64-2024-06-04 #3437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75e4fb1
update last_rebase.sh
Jun 5, 2024
c5230cf
update changelog
Jun 5, 2024
18ad77a
update manifests
Jun 5, 2024
0b9573b
update buildfiles
Jun 5, 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-06-03-194837
OCP_VERSION := 4.17.0-0.nightly-arm64-2024-06-04-204856
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-06-03-194837"
"base": "4.17.0-0.nightly-arm64-2024-06-04-204856"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:784ffaf9726c83ff250cdba0952745f9dcd32a8c76642aea6b8a469578921df3",
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-06-03-194837"
"base": "4.17.0-0.nightly-arm64-2024-06-04-204856"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b13cf2ff7feeab314f8a6a61d7518e7f5bfbfdd344bda075bd824c8ffae38be",
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,11 +1,11 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-06-03-194837"
"base": "4.17.0-0.nightly-arm64-2024-06-04-204856"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40d3fe3e0988d8ab81c8d48d8395647e1339772e8f7e415f81b2741cddee5d4b",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31aaaed7879eb677754e03c76dad6de50861ea9f7149235dbd731408a2f58778",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d31d0d5a0225cea151fd0caaaf945ff09460bacdcd3c8078aeb3b9340a749f14",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db37ca0409e0001765416949466017da80977513846f5e398dffa266e82a16c1",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:21c7affe2c1591c44055712e38f3ebc45d3bbc212e760c966d0336ce65c1e0ec",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f6bd6e3d67da49b1205f3c76e3783d1e9f0ff7b55bff9d6a6f1a7504b8717ecd",
"openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0997cff18501214a7f1e539df24542640dd2c04267c89baf9bd1558391f63b61",
Expand Down
16 changes: 16 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,16 @@
- oc image-arm64 0bea0594b2cdb44de33be3a96f8ac2cf68e10ee2 to b9859d53cacf7496eadcd18d46c63f55519dc6cc
- 93364191 2024-05-31T12:46:08-05:00 Update comment about using OpenFileSequential
- cc9777cf 2024-05-31T13:44:43+02:00 pkg/helpers: remove legacy pkg
- 75239059 2024-05-30T12:47:13+03:00 go 1.22 lint fix
- ac9f66b2 2024-05-30T11:43:35+03:00 Run make update
- c79a4243 2024-05-30T09:30:11+03:00 Update tools images kube version to 1.30.1
- a5b489a4 2024-05-30T09:14:52+03:00 Manually bump indirect dependency runc to v1.1.12 to pull some fixes
- a36a0ce8 2024-05-30T09:13:07+03:00 Bump aws-sdk-go version to v1.53.12
- e3d06e49 2024-05-30T09:06:29+03:00 React to type changes in containers/image/v5 v5.30.1 version
- 2b5c5e85 2024-05-30T09:06:07+03:00 Bump containers/image/v5 to v5.30.1
- 5e4e38dc 2024-05-30T08:59:59+03:00 Go 1.22 changes the escape output of some special characters
- 891c2a1d 2024-05-30T08:51:18+03:00 Bump go based imports
- 184a6699 2024-05-30T07:48:00+03:00 Bump k8s dependencies to 1.30
- 79f5fddb 2024-05-30T07:41:10+03:00 Remove already deprecated versions
- bf68f8e5 2024-05-30T07:37:06+03:00 Bump go version to 1.22

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 @@ -26,7 +26,7 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 8ea2c994df4296ec161023d
https://github.com/openshift/ovn-kubernetes image-amd64 d5664bf3414ff6a66e76100a18570ed0297e0f47
https://github.com/openshift/kubernetes image-amd64 4a87b5377b72baed624e7afa315bb8622117ebf9
https://github.com/openshift/service-ca-operator image-amd64 538c7b98a689e573b61e1abb1cb649da470c5fac
https://github.com/openshift/oc image-arm64 0bea0594b2cdb44de33be3a96f8ac2cf68e10ee2
https://github.com/openshift/oc image-arm64 b9859d53cacf7496eadcd18d46c63f55519dc6cc
https://github.com/openshift/coredns image-arm64 4a14f3481105adf4b4086ba9727bee3dec0847fd
https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191
https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191
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.17.0-0.nightly-2024-05-24-193308" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-03-194837"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-05-24-193308" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-04-204856"