Skip to content

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-10-07-200953_amd64-2024-10-07_arm64-2024-10-07 #4035

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

Closed
wants to merge 4 commits into from
Closed

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-10-07-200953_amd64-2024-10-07_arm64-2024-10-07 #4035

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
f6a1f12
update last_rebase.sh
Oct 8, 2024
6908a18
update changelog
Oct 8, 2024
2cc5a53
update manifests
Oct 8, 2024
88f9fda
update buildfiles
Oct 8, 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.18.0-0.nightly-arm64-2024-10-06-235641
OCP_VERSION := 4.18.0-0.nightly-arm64-2024-10-07-232140
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.18.0-0.nightly-2024-10-06-174104
OCP_VERSION := 4.18.0-0.nightly-2024-10-07-200953
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.18.0-0.nightly-arm64-2024-10-06-235641"
"base": "4.18.0-0.nightly-arm64-2024-10-07-232140"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf985f63a1208e9d3ee5262bebb4dd7f5d05d7469bf32f7ccf369e3ae7aa79a7",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-2024-10-06-174104"
"base": "4.18.0-0.nightly-2024-10-07-200953"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd82881597e6e1e40cac6029323e29f94afb0b86e5b50214d305ef7b72526461",
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.18.0-0.nightly-arm64-2024-10-06-235641"
"base": "4.18.0-0.nightly-arm64-2024-10-07-232140"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b8f8b6d818a2a7a02fb22f6a0f8896f0fab18e0967ee3bfa3137947198214c2",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-2024-10-06-174104"
"base": "4.18.0-0.nightly-2024-10-07-200953"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:135ad5129d7715ea5f381fea7de4c2e382b863f15dd896d0f55b6d0a799a6ca8",
Expand Down
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.18.0-0.nightly-arm64-2024-10-06-235641"
"base": "4.18.0-0.nightly-arm64-2024-10-07-232140"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:23c6086305f6327cf3211a8602802c62aefe6a70290fdd7dcef6975e0e17a0af",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-2024-10-06-174104"
"base": "4.18.0-0.nightly-2024-10-07-200953"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79d9110d22a11359889d029dba7aeddc9f93e5ebaf60edbad6716b1cb640f844",
Expand Down
47 changes: 2 additions & 45 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,3 @@
- api embedded-component e415140e5d5f18cccd54255f4cd218649e88a328 to b1f700bdd8d22c4033be4e4e9ef751d89ade42e8
- 5ed6751 2024-10-03T21:22:42-04:00 RFE-6242: ingress: rename loadBalancerIP to floatingIP
- a2ad73e 2024-10-03T16:07:59+01:00 Fix network tests after update to 1.31
- 6f1022c 2024-10-03T15:04:37+01:00 Update tests vendor
- 1ff8613 2024-10-03T15:04:36+01:00 Update integration tests module to K8s 1.31
- 1f55562 2024-10-03T13:47:10+01:00 Add envtest archives for K8s 1.31.1
- 692815c 2024-10-03T12:09:32+01:00 Publish kubebuilder openshift binaries to 1.31.0
- 444665a 2024-10-01T16:15:14-04:00 generated
- b66574f 2024-10-01T13:59:23-04:00 align the easy lowlevel operator condition validation to metav1.Condition

- cluster-ingress-operator embedded-component 21d8fb4437149b00bd67ba3f357db6b596115592 to 6587d8cbfc46ab5e3412dbc7d13c935421099516
- 8afaffb 2024-09-17T03:39:13-04:00 aws/dns: Always log AWS API endpoints
- 8999989 2024-09-17T03:39:01-04:00 aws/dns: Tidy up logging for custom endpoints
- e0c2c2b 2024-09-17T03:38:51-04:00 aws/dns: Replace a useless break statement
- f634f87 2024-09-17T03:38:31-04:00 aws/dns: Move a to-do for elbv2 custom endpoint
- 30f72ca 2024-09-17T03:37:26-04:00 aws/dns: Add test for NewProvider

- kubernetes embedded-component 1892e4deb967a2b39cfc2fea87a8bd49274449ef to 8540bd493e8a42ffb61a3f470f71290488332b1c
- 1b4e07927 2024-10-03T09:23:47-03:00 UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs

- oc image-amd64 6bba0756103a7df8a126920ecc35dbcd7915d167 to 4afb880d54e10ac4d0e7a6db0036dc7537bc639d
- 4afb880d 2024-10-05T13:22:46+00:00 NO-JIRA: Use suggested functions instead of deprecated ones (#1894)
- d8cac253 2024-10-04T10:06:03-07:00 pkg/cli/admin/upgrade/recommend: Show most-recent update options
- 768f7a04 2024-10-02T07:53:31+03:00 Change kube version in image components
- 2c3abbe4 2024-10-02T07:53:31+03:00 React to changes in kubectl/cmd.go
- c9a615b7 2024-10-02T07:53:31+03:00 React to interface changes in commands
- eac0d7de 2024-10-02T07:53:22+03:00 Bump k8s dependencies to 1.31.1 and go mod tidy/vendor
- a915ac6f 2024-10-02T07:53:22+03:00 Update to new go version 1.22.5
- 0cd2e2c9 2024-09-30T10:08:40-07:00 pkg/cli/admin/upgrade/recommend/examples: Update examples

- kubernetes image-amd64 1892e4deb967a2b39cfc2fea87a8bd49274449ef to 8540bd493e8a42ffb61a3f470f71290488332b1c
- 1b4e07927 2024-10-03T09:23:47-03:00 UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs

- oc image-arm64 6bba0756103a7df8a126920ecc35dbcd7915d167 to 4afb880d54e10ac4d0e7a6db0036dc7537bc639d
- 4afb880d 2024-10-05T13:22:46+00:00 NO-JIRA: Use suggested functions instead of deprecated ones (#1894)
- d8cac253 2024-10-04T10:06:03-07:00 pkg/cli/admin/upgrade/recommend: Show most-recent update options
- 768f7a04 2024-10-02T07:53:31+03:00 Change kube version in image components
- 2c3abbe4 2024-10-02T07:53:31+03:00 React to changes in kubectl/cmd.go
- c9a615b7 2024-10-02T07:53:31+03:00 React to interface changes in commands
- eac0d7de 2024-10-02T07:53:22+03:00 Bump k8s dependencies to 1.31.1 and go mod tidy/vendor
- a915ac6f 2024-10-02T07:53:22+03:00 Update to new go version 1.22.5
- 0cd2e2c9 2024-09-30T10:08:40-07:00 pkg/cli/admin/upgrade/recommend/examples: Update examples

- kubernetes image-arm64 1892e4deb967a2b39cfc2fea87a8bd49274449ef to 8540bd493e8a42ffb61a3f470f71290488332b1c
- 1b4e07927 2024-10-03T09:23:47-03:00 UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
- api embedded-component b1f700bdd8d22c4033be4e4e9ef751d89ade42e8 to 82e082220d910f489d35880174e2eb90e21f5589
- 77162c9 2024-10-02T16:12:22-04:00 CORS-3695: Update the api for aws cluster hosted dns options

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
@@ -1,4 +1,4 @@
https://github.com/openshift/api embedded-component b1f700bdd8d22c4033be4e4e9ef751d89ade42e8
https://github.com/openshift/api embedded-component 82e082220d910f489d35880174e2eb90e21f5589
https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 8122add3d1529f0ea8fa918b45e3d7b35d5a0388
https://github.com/openshift/cluster-dns-operator embedded-component 208d50c1a5e0aaeb991366daa749abdffa803224
https://github.com/openshift/cluster-ingress-operator embedded-component 6587d8cbfc46ab5e3412dbc7d13c935421099516
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.18.0-0.nightly-2024-10-06-174104" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-10-06-235641"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-10-07-200953" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-10-07-232140"