Skip to content

NO-ISSUE: rebase-release-4.16-4.16.0-0.nightly-2024-07-07-171226_amd64-2024-07-07_arm64-2024-07-07 #3599

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
microshift-rebase-script wants to merge 4 commits into from
Closed

NO-ISSUE: rebase-release-4.16-4.16.0-0.nightly-2024-07-07-171226_amd64-2024-07-07_arm64-2024-07-07 #3599

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
7913e18
update last_rebase.sh
Jul 8, 2024
59bec87
update changelog
Jul 8, 2024
46792b4
update manifests
Jul 8, 2024
2077ddb
update buildfiles
Jul 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.16.0-0.nightly-arm64-2024-07-04-130027
OCP_VERSION := 4.16.0-0.nightly-arm64-2024-07-07-201719
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.16.0-0.nightly-2024-07-04-133225
OCP_VERSION := 4.16.0-0.nightly-2024-07-07-171226
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.16.0-0.nightly-arm64-2024-07-04-130027"
"base": "4.16.0-0.nightly-arm64-2024-07-07-201719"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2163937c0603665d84995a0cbce385fc4378ed0f928ffe25601526872692cdf4",
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.16.0-0.nightly-2024-07-04-133225"
"base": "4.16.0-0.nightly-2024-07-07-171226"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:897f93d7062d3adcebaffdb4e11f7873d87fbb3a9ade8cc613e3a3c3926f5ccb",
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.16.0-0.nightly-arm64-2024-07-04-130027"
"base": "4.16.0-0.nightly-arm64-2024-07-07-201719"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed815991affb81baae0c368cf44104301d427449eb9fbd9326f5fb5330db9214",
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.16.0-0.nightly-2024-07-04-133225"
"base": "4.16.0-0.nightly-2024-07-07-171226"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a15e18d55c09786fa759b8483ca463b98b8bbcf396dc9ffa41e9826224f43432",
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,14 +1,14 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-07-04-130027"
"base": "4.16.0-0.nightly-arm64-2024-07-07-201719"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d05a93ab260dbd4b4315ed185bf9b8af00ddd3d71a6e678ebd1db79d2e5f31c",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f51acbc42990f9d72cfdd91d26ca00a50d89ede15220cba52cc58e8141a630d",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:120c6288a3bf87628dd545e3d92835dcfd3ca9496d2a040151f9b9cd436e22fd",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c228d04f2e4bc9f6d1713b69da37ba154e40f98ad6b9957c016a539bf93bfa6",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb30381dd33d379218906ad8c1291a8bc54a0f4505ca07d1447048d61c670c85",
"openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe6e937b11ced626b437559e1839fcea61db60a123aad7406508c54f0d1cb8b2",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc6b85c73f5906ea0cc7d63919ba2fb61b5b93452e5d1f26da87847bcae83cd2",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:271d8843a5c3b6f36a80b69ecf8073b68455ca30a108689caf03f7e7b6011e47",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cded20c4ee55460943b0da062ba4550d44dcca449778ab7880445d27af2daf17",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
Expand Down
6 changes: 3 additions & 3 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.16.0-0.nightly-2024-07-04-133225"
"base": "4.16.0-0.nightly-2024-07-07-171226"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5bd95d4a99cd763fa451ab36bd2ec918f89ca8dddace87aeb5675aac10688278",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:294aac4861c29fc80a865ba2d6a7bd59958cc4cb80103c359c66282e1a8613bf",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e46bf4c5952793b5bd9aee06280e57eb07a61cd6be3dc411c4c2242e62dd151",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37b7a73669052d17e6daaf245cc3490e0faabaff994ef075682dee6b79d5c530",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3efbfad53f80bd8988582c9047caf18ba8f184cb8d7afaecbac1b78d38ae4b9a",
"openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da34697f33bbbe2d1640528c15bbf844d7be8394c6a2d99683efa3e6edac2e3a",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:099b9026285b78d6ca6d79992251dc8f3d4d6ce31232b0b1e90e34a99b55707e",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5e4bf03c5f9b61c47711e488588cd3e04cae1d534157928af8f648906a006b0e",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f13c2f02c89a76224e65143c61a65808c9a83cb5e7a60ec402824ad35e8f0067",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
Expand Down
32 changes: 18 additions & 14 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
- cluster-kube-apiserver-operator embedded-component d790493cfc43fd33450ca27633cbe37aa17427d2 to b0eea1220af097c61241ebe221af4c220d72f0b7
- 185521f 2024-06-19T18:30:49+04:00 Revert "Add sno section to alert description"
- 39bf4ba 2024-06-19T18:30:42+04:00 add highcpuusagesnoalertcontroller tests
- 9dbc913 2024-06-19T18:30:00+04:00 add SNO control plane high cpu usage alert
- machine-config-operator embedded-component 8c4afe087d64b028fdc16df24204fe4f7f7e6127 to 73d5f16fdc96f3d7a4bc87edc77d394e53a8bb9c
- 4b0db3fb 2024-07-04T03:32:50+00:00 MCD-pull: run after network-online.target in Azure

- ovn-kubernetes image-amd64 8a9743708ae117595226a52b4856f8c032fed2ab to f80acd01c9a4106b0f9681181ed43f059986f4d9
- e53cba10 2024-06-17T19:36:37+02:00 nit-fix: log statement had extra %s
- c912892c 2024-06-14T16:27:09+02:00 Add events for >99 priority
- 8b4b2519 2024-06-14T16:26:27+02:00 ANP: Allow two ANPs at the same priority
- b3398edc 2024-06-14T16:23:46+02:00 e2e: Re-enable PASS action logging
- oc image-amd64 e4cacc0be012b75a230f07e3902a1ede9a2ecba9 to 8c491baf99f880bd767cb325effbb35beeb47a6c
- 02ca8d32 2024-07-04T08:08:33+02:00 bump k8s version in the Makefile and Dockerfiles
- 2f3e536d 2024-07-03T14:37:55+02:00 Remove invalid test cases: empty dockerfiles are no longer allowed
- 4bcd2670 2024-07-03T14:37:14+02:00 Lower case command value before comparision
- 1f27c7ef 2024-07-02T15:08:41+02:00 bump(k8s)=1.29.6

- ovn-kubernetes image-arm64 8a9743708ae117595226a52b4856f8c032fed2ab to f80acd01c9a4106b0f9681181ed43f059986f4d9
- e53cba10 2024-06-17T19:36:37+02:00 nit-fix: log statement had extra %s
- c912892c 2024-06-14T16:27:09+02:00 Add events for >99 priority
- 8b4b2519 2024-06-14T16:26:27+02:00 ANP: Allow two ANPs at the same priority
- b3398edc 2024-06-14T16:23:46+02:00 e2e: Re-enable PASS action logging
- ovn-kubernetes image-amd64 f80acd01c9a4106b0f9681181ed43f059986f4d9 to 7f412836bd26c3d6e9735552a7fd615e7e7e9695
- 147d4eee 2024-07-03T10:02:05+00:00 Fix race condition when creating/deleting namespace address set

- oc image-arm64 e4cacc0be012b75a230f07e3902a1ede9a2ecba9 to 8c491baf99f880bd767cb325effbb35beeb47a6c
- 02ca8d32 2024-07-04T08:08:33+02:00 bump k8s version in the Makefile and Dockerfiles
- 2f3e536d 2024-07-03T14:37:55+02:00 Remove invalid test cases: empty dockerfiles are no longer allowed
- 4bcd2670 2024-07-03T14:37:14+02:00 Lower case command value before comparision
- 1f27c7ef 2024-07-02T15:08:41+02:00 bump(k8s)=1.29.6

- ovn-kubernetes image-arm64 f80acd01c9a4106b0f9681181ed43f059986f4d9 to 7f412836bd26c3d6e9735552a7fd615e7e7e9695
- 147d4eee 2024-07-03T10:02:05+00:00 Fix race condition when creating/deleting namespace address set

10 changes: 5 additions & 5 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,28 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 5315d37
https://github.com/openshift/etcd embedded-component bc2fec27ff5b086436d438157c24396f280e0305
https://github.com/openshift/kubernetes embedded-component aba1e8d781a8de14bd80a3e4ea0f9a29c5a8530d
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 969a60e9e2466c44f5b3ffd43fe3ecab11bf1e51
https://github.com/openshift/machine-config-operator embedded-component 8c4afe087d64b028fdc16df24204fe4f7f7e6127
https://github.com/openshift/machine-config-operator embedded-component 73d5f16fdc96f3d7a4bc87edc77d394e53a8bb9c
https://github.com/openshift/openshift-controller-manager embedded-component 1432fe0aa630ce83c0c3fd18c86e1fb9a47ae4cc
https://github.com/openshift/operator-framework-olm embedded-component 555e529c944f9b8b93d2e4d9626e12de51f59854
https://github.com/openshift/route-controller-manager embedded-component 3112b458983c6fca6f77d5a945fb0026186dace6
https://github.com/openshift/service-ca-operator embedded-component 538c7b98a689e573b61e1abb1cb649da470c5fac
https://github.com/openshift/oc image-amd64 e4cacc0be012b75a230f07e3902a1ede9a2ecba9
https://github.com/openshift/oc image-amd64 8c491baf99f880bd767cb325effbb35beeb47a6c
https://github.com/openshift/coredns image-amd64 04d84f7f2e17ff464fad3f2841e7b29a43c8382f
https://github.com/openshift/csi-external-snapshotter image-amd64 5315d37a1e5415e8b6870f23e50238681979cc28
https://github.com/openshift/csi-external-snapshotter image-amd64 5315d37a1e5415e8b6870f23e50238681979cc28
https://github.com/openshift/csi-external-snapshotter image-amd64 5315d37a1e5415e8b6870f23e50238681979cc28
https://github.com/openshift/router image-amd64 4d9b8c4afa6cd89b41f4bd5e7c09ccddd8679bc6
https://github.com/openshift/kube-rbac-proxy image-amd64 8ea2c994df4296ec161023d8ff85f9ea0e383216
https://github.com/openshift/ovn-kubernetes image-amd64 f80acd01c9a4106b0f9681181ed43f059986f4d9
https://github.com/openshift/ovn-kubernetes image-amd64 7f412836bd26c3d6e9735552a7fd615e7e7e9695
https://github.com/openshift/kubernetes image-amd64 aba1e8d781a8de14bd80a3e4ea0f9a29c5a8530d
https://github.com/openshift/service-ca-operator image-amd64 538c7b98a689e573b61e1abb1cb649da470c5fac
https://github.com/openshift/oc image-arm64 e4cacc0be012b75a230f07e3902a1ede9a2ecba9
https://github.com/openshift/oc image-arm64 8c491baf99f880bd767cb325effbb35beeb47a6c
https://github.com/openshift/coredns image-arm64 04d84f7f2e17ff464fad3f2841e7b29a43c8382f
https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28
https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28
https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28
https://github.com/openshift/router image-arm64 4d9b8c4afa6cd89b41f4bd5e7c09ccddd8679bc6
https://github.com/openshift/kube-rbac-proxy image-arm64 8ea2c994df4296ec161023d8ff85f9ea0e383216
https://github.com/openshift/ovn-kubernetes image-arm64 f80acd01c9a4106b0f9681181ed43f059986f4d9
https://github.com/openshift/ovn-kubernetes image-arm64 7f412836bd26c3d6e9735552a7fd615e7e7e9695
https://github.com/openshift/kubernetes image-arm64 aba1e8d781a8de14bd80a3e4ea0f9a29c5a8530d
https://github.com/openshift/service-ca-operator image-arm64 538c7b98a689e573b61e1abb1cb649da470c5fac
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.16.0-0.nightly-2024-07-04-133225" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-07-04-130027"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-07-07-171226" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-07-07-201719"