Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.12.0-0.nightly-arm64-2023-05-17-125210"
"base": "4.12.0-0.nightly-arm64-2023-05-22-001909"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c30ab6f34cb327d28dcca7fad4b1d1d9281ff1296aa4a63f957239c6e4fceeb3",
Expand All @@ -13,7 +13,7 @@
"csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42d91b64873fba1da92f6a694235c612b070d11494833a7d90fb150e6172b6e5",
"csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ee678922fa589c82ce577ffabf77756dd29e6505992f539960bf7f3e0df09d1",
"csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:63829b06638d884ac6338e9b7c6d570138fdce9eff0e177734ed1641387ac9c8",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e38d5254136046591e824c5a21048fc06ec1a732e4556e4f33975a747acf7851",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ff2110b1f09f187ae186d14f2db91691e40e0452b6a966ee635acd7f4492640",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62caed97026a5782e6887bfe59b2efce8096667a0047006fcc59411890841749",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9c16b90b14db5c12787fba494b12bb3cb246e68bd86af46f6a48514bfd42d44"
}
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.12.0-0.nightly-2023-05-17-133811"
"base": "4.12.0-0.nightly-2023-05-22-001909"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b45d4cac21969d8200908b9a97338c9923e8a07f843b084849791f11ffb8926c",
Expand All @@ -13,7 +13,7 @@
"csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e3791ff1c9e66224ac2ec0a1b3b17fc1f696a377c1cf3bd9da878e16fffb58b",
"csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81efe2d885bb60790bcafdae37e302964f69106e51abc5cb0f76e6687a4b35a9",
"csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:937b29103b0251248ced120c232fba06446ffcd2ed9b8d54c111de6ad3ec405d",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb65620e43f6ef389b59f38854b38db729060bb9496e10198d11c6a63b76401e",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c81687486ef0e3df1e4f893db43c20aece615544db222a08e67a07b31d1b3d8",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e63c74cff331ad81d0c74ecd8e25e104492809723e3534ba239f473c4cc4034d",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9520b35f5431bfed022dad1c43dd52c169f8dbabe05670e0527b8cde1e4e7d04"
}
Expand Down
26 changes: 4 additions & 22 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,4 @@
# cluster-ingress-operator embedded-component 6f3e22f1d08f03e0d1e333bbc718600baa79ebb7 to 21c38d53ccc9e2b96f412ca58b8208ecfb6e6294
4dc3f0a9f14cc066dbc1db270dc59318db4f6f30 2023-04-24T16:16:49+00:00 service-internal.yaml: Target metrics port by name
fb3d2940ae564a6cc65fef990906bc15e33e7382 2023-04-24T16:16:49+00:00 ensureInternalIngressControllerService: Updates
3e41a6d8268fc14ea7a2c5ef5252ebc26cc953bd 2023-04-24T16:16:49+00:00 ensureInternalIngressControllerService: Reformat
# cluster-network-operator embedded-component 4ff7caec8e5bbb761e00f723bdd3fff26f04bc54 to d17cd49b76269870402b67a6967abdd6ddbc9952
ac15f91de8671b5150819757cf806c2475adcc9c 2023-05-03T15:25:46-04:00 Whereabouts should implement the reconciliation controller
ffd3d5636bbaa84d9ce417223371c297a46e5726 2023-05-02T16:08:47+00:00 rbac: ovn-kubernetes: add aggregate-to-cluster-reader permissions
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 401c3ae3508d24dccb5fce60cf903d1718f90832
916443e21442e51435fb467138015daf70952932 2023-04-26T18:46:58+02:00 Delete equivalent ACLs when searching by predicate.
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.
24229b2684a0b700edcc3660b463046e466d0974 2023-02-14T09:55:42+02:00 Egress Services: Fix nodeSelector parsing
e237e479f64783e561b0405e010418251631c4bd 2023-02-14T09:55:32+02:00 Egress Service: split the contexts of the tests
# ovn-kubernetes image-arm64 774134525ed229a934445ed209090a71d952ed7f to 401c3ae3508d24dccb5fce60cf903d1718f90832
916443e21442e51435fb467138015daf70952932 2023-04-26T18:46:58+02:00 Delete equivalent ACLs when searching by predicate.
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.
24229b2684a0b700edcc3660b463046e466d0974 2023-02-14T09:55:42+02:00 Egress Services: Fix nodeSelector parsing
e237e479f64783e561b0405e010418251631c4bd 2023-02-14T09:55:32+02:00 Egress Service: split the contexts of the tests
# ovn-kubernetes image-amd64 401c3ae3508d24dccb5fce60cf903d1718f90832 to ce142ecac5f04888793667e87304591a0dcffb5b
1c944ac98621a8b4bc3054070f435cd863929c17 2023-05-15T10:32:47+02:00 Call SyncEndpoints from AddService
# ovn-kubernetes image-arm64 401c3ae3508d24dccb5fce60cf903d1718f90832 to ce142ecac5f04888793667e87304591a0dcffb5b
1c944ac98621a8b4bc3054070f435cd863929c17 2023-05-15T10:32:47+02:00 Call SyncEndpoints from AddService
4 changes: 2 additions & 2 deletions scripts/auto-rebase/commits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 401c3ae3508d24dccb5fce60cf903d1718f90832
https://github.com/openshift/ovn-kubernetes image-amd64 ce142ecac5f04888793667e87304591a0dcffb5b
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 401c3ae3508d24dccb5fce60cf903d1718f90832
https://github.com/openshift/ovn-kubernetes image-arm64 ce142ecac5f04888793667e87304591a0dcffb5b
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
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-05-17-133811" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-05-17-125210"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-05-22-001909" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-05-22-001909"