Skip to content

NO-ISSUE:rebase-4.12.0-0.nightly_amd64-2023-05-01-175018_arm64-2023-05-01-175020 #1746

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 3 commits into from
Closed

NO-ISSUE:rebase-4.12.0-0.nightly_amd64-2023-05-01-175018_arm64-2023-05-01-175020 #1746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6b9e80
update last_rebase.sh
May 2, 2023
13d7873
update changelog
May 2, 2023
cbb44f5
update manifests
May 2, 2023
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
4 changes: 2 additions & 2 deletions 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.12.0-0.nightly-arm64-2023-04-22-075131"
"base": "4.12.0-0.nightly-arm64-2023-05-01-175020"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b1e0a2ed8babc14c8d3acd30bf6a946c63213cf254c7df4490b704fa6cc0611",
Expand All @@ -13,7 +13,7 @@
"csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e384f94b11af2e4d0338042c00f5568265c139c9f90fc3c10ca323f003b0f06e",
"csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42ba45d77ed96b3289d6193d3e73f16da64071daa661ca114515f6feecd4531c",
"csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e9866127ffe26bf048118fc481fac169a824bb28a013f80a10b4750a87c9c28",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d578167925b42cd92a6269972f7436d61c62628210aba380fe266235b5a6083",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0fc49e467f7c6e15c42d5e8b9e9beac127326bbc05efb4996b18516e025e135a",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c4f4adb2f3469f995052872c1d9c3df516559b3fb556bc97cbf06089dffddbe6",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b8a6a4f0b3fcb2864fc8c8506536fb2b6ce3ec0ae6f46027951225bf17ea3446"
}
Expand Down
4 changes: 2 additions & 2 deletions 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.12.0-0.nightly-2023-04-21-075837"
"base": "4.12.0-0.nightly-2023-05-01-175018"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09dc3e8e8b71674cbd069ac534816a6eac6ffe7fb2ea4767b28fc4261e1b1704",
Expand All @@ -13,7 +13,7 @@
"csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:465385e1fcfd1a844ba0fe840c2e2cbb509bcb751eb856886a7792fee62cb245",
"csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:260b1aa6c0f1bee5a21abcdd66fa1c08973d4e470a5dd3deffbfa61e18be613d",
"csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:705b8e4192643df1c042fa31c264974c41b9dfa82f204788ec5e50a208e9874f",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:154863a9d8ca268e05cb3e5513302355c0591feab8736e16466ff64166444baa",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4023679762a00aab4f0afd841a02962f5b4d0b250ee7c1ef82c17039f21e8a79",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c719394a975c77546ec44634abdb59365e24d7796a428d580289d7a763919aeb",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5177e5ecc3e09f921ad7719ea739df5111fad532dae08f7a219448f1ca1aa604"
}
Expand Down
14 changes: 10 additions & 4 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
# kubernetes embedded-component 27e744f55d2e99eb8265c837e2571e47559079f6 to 37a9a084bcb483a38e8f88349fa6a21c1b6be8a3
fcc276e6484511855b2f9407913625d4b067b77a 2023-02-16T12:47:20+00:00 UPSTREAM: <carry>: add default sysctls for kubelet in rpm
# kubernetes image-amd64 27e744f55d2e99eb8265c837e2571e47559079f6 to 37a9a084bcb483a38e8f88349fa6a21c1b6be8a3
fcc276e6484511855b2f9407913625d4b067b77a 2023-02-16T12:47:20+00:00 UPSTREAM: <carry>: add default sysctls for kubelet in rpm
# cluster-network-operator embedded-component 4ff7caec8e5bbb761e00f723bdd3fff26f04bc54 to 227d9f97dddf86d614afac83be4d7c9258b542bc
886c4d2e5d950644ee59e17d5658ee3a74b4dc25 2023-04-07T23:34:39+00:00 With Hypershift run as user passed from hypershift
259925bb0e5946a7352c0166630fffca34f7d9bf 2022-12-22T11:58:35+01:00 Fix CNO crashing when Kuryr without MTU is set
bbdcb0a831427037d88fe5b03fb763342648bd0a 2022-12-15T11:43:34+00:00 Kuryr: If set use MTU from Config for svc net
# ovn-kubernetes image-amd64 774134525ed229a934445ed209090a71d952ed7f to 49308a53d2153f34f0e4c1375688416c4e848d00
c16fe5ac36515c76d656d8e37ca45ab30923da13 2023-04-21T19:10:12+02:00 Add an option to enable scale metrics in kind
371e5589369c35a0121f1cee7edfb2d46b45e3af 2023-04-21T19:01:31+02:00 Add MetricMasterSyncDuration metric to track how much it takes for ovn-k master to start watching every resource. Add scale metrics for network policies, rename existing enable-eip-scale-metrics flag to more general enable-scale-metrics, and use it for network policy metric too.
# ovn-kubernetes image-arm64 774134525ed229a934445ed209090a71d952ed7f to 49308a53d2153f34f0e4c1375688416c4e848d00
c16fe5ac36515c76d656d8e37ca45ab30923da13 2023-04-21T19:10:12+02:00 Add an option to enable scale metrics in kind
371e5589369c35a0121f1cee7edfb2d46b45e3af 2023-04-21T19:01:31+02:00 Add MetricMasterSyncDuration metric to track how much it takes for ovn-k master to start watching every resource. Add scale metrics for network policies, rename existing enable-eip-scale-metrics flag to more general enable-scale-metrics, and use it for network policy metric too.
6 changes: 3 additions & 3 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 6f3e22f
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 2076f3d0e4fea6fca54028ec7831407173ea81f5
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 1c2157df6e9031bf6abb9250d2bec901608fe5b4
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 845ae423e831b1cacf0bcae5e6528f1d21b5ddf2
https://github.com/openshift/cluster-network-operator embedded-component 4ff7caec8e5bbb761e00f723bdd3fff26f04bc54
https://github.com/openshift/cluster-network-operator embedded-component 227d9f97dddf86d614afac83be4d7c9258b542bc
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component d1915d130481541b8bacb5b98eddbc1541809d0a
https://github.com/openshift/cluster-policy-controller embedded-component 139ac0499ac4d744023827ceb6d16aa6b467be27
https://github.com/openshift/etcd embedded-component c1d76ffd4b4cf0a0d2a6056a505fbef0b187c027
Expand All @@ -20,7 +20,7 @@ https://github.com/openshift/csi-livenessprobe image-amd64 720e1d6e3e828dec99080
https://github.com/openshift/csi-node-driver-registrar image-amd64 805d5ac247137b02e6081e3eb7aa1fb9f4c7b4b2
https://github.com/openshift/router image-amd64 3065f6583f3925328fbdbfe95e3bc7bb7a084d33
https://github.com/openshift/kube-rbac-proxy image-amd64 94f3fde785a22afdc77768f5c346c7d3195274d2
https://github.com/openshift/ovn-kubernetes image-amd64 774134525ed229a934445ed209090a71d952ed7f
https://github.com/openshift/ovn-kubernetes image-amd64 49308a53d2153f34f0e4c1375688416c4e848d00
https://github.com/openshift/kubernetes image-amd64 37a9a084bcb483a38e8f88349fa6a21c1b6be8a3
https://github.com/openshift/service-ca-operator image-amd64 299b7097a49385fdd4f86eccedc07f3a192e2504
https://github.com/openshift/oc image-arm64 31aa3e89a926f81aa0af30320ffcb71acadf3015
Expand All @@ -31,6 +31,6 @@ https://github.com/openshift/csi-livenessprobe image-arm64 720e1d6e3e828dec99080
https://github.com/openshift/csi-node-driver-registrar image-arm64 805d5ac247137b02e6081e3eb7aa1fb9f4c7b4b2
https://github.com/openshift/router image-arm64 3065f6583f3925328fbdbfe95e3bc7bb7a084d33
https://github.com/openshift/kube-rbac-proxy image-arm64 94f3fde785a22afdc77768f5c346c7d3195274d2
https://github.com/openshift/ovn-kubernetes image-arm64 774134525ed229a934445ed209090a71d952ed7f
https://github.com/openshift/ovn-kubernetes image-arm64 49308a53d2153f34f0e4c1375688416c4e848d00
https://github.com/openshift/kubernetes image-arm64 37a9a084bcb483a38e8f88349fa6a21c1b6be8a3
https://github.com/openshift/service-ca-operator image-arm64 299b7097a49385fdd4f86eccedc07f3a192e2504
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.12.0-0.nightly-2023-04-21-075837" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-04-22-075131"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-05-01-175018" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-05-01-175020"