From 36b88fa9347a3e23dbdc9ccebf8e7107e8f4a1a2 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 28 Mar 2023 05:36:28 +0000 Subject: [PATCH 1/3] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index e66058ad95..b282e5bf86 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-03-23-204038" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-03-25-181910" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-03-23-204038" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-03-27-214926" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" From 85dc915ef2298fa4132a903d5ab34a4f69a22fb0 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 28 Mar 2023 05:36:28 +0000 Subject: [PATCH 2/3] update changelog --- scripts/auto-rebase/changelog.txt | 35 ++++++++----------------------- scripts/auto-rebase/commits.txt | 2 +- 2 files changed, 10 insertions(+), 27 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index b051ff83e9..dd554d18f1 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,26 +1,9 @@ -# cluster-kube-apiserver-operator embedded-component 5cec361179f3658986890a87d0b51f40a1da89ad to 3e62b53e39db960ccc16d717d1a25d751d4e9c49 -1c5fd4bda695466143aedbd0879a3c7817d5190e 2023-03-22T14:10:31+01:00 bump o/api for updated featuregates -4cd9677808d79ec82541c97cc9140f59e87edebb 2023-03-15T14:13:20-04:00 revert dev cert rotation for 4.13 -e85a5c62570176c72e7b0b45e0a4e217c1654105 2023-03-15T14:12:07+01:00 psaconfig: invert the enforce/log logic to default to logging -# cluster-kube-controller-manager-operator embedded-component 4ca346ef97def3697f1aa0368c9b35459b9b2f59 to 2a3e578c1007d7534eadffcca2adc979cb712995 -decb5bb7cb39f9eaa2443d2210a25cbddcae4273 2023-03-20T09:46:22-04:00 update vendor folder -24c84fdcd65444c9fbf2635b1848309abefc6edc 2023-03-20T09:46:10-04:00 bump(library-go) -# etcd embedded-component 13c18c444a8c6a86ccbba16cce664008f5f948bd to f70da9d78221bc3e6bf8ac14c0c4ecc106f4f57d -5c156b653c1f67d0d49d4857fd868f72cc0c854f 2023-01-11T14:39:32-08:00 Update owners -# kubernetes embedded-component 06e8c46c9f0d3f6bfcd1e146c09647e4b634e4eb to dc93b13d1f6518d62ea9e3dea64d843c2ce35cbf -916c65ebea0205d3c18d3701f48cf568ef9e7220 2023-03-17T23:03:18+00:00 UPSTREAM: 115328: annotate early and late requests -a6938113b34b64c0626efa322cd4d3c1132d64fb 2023-03-17T23:03:18+00:00 UPSTREAM: : Revert "UPSTREAM: : annotate audit events for requests during unready phase and graceful termination phase" -# router image-amd64 69eda4bd427c3f27d9993afa35461f4fc1dc0357 to e28644631982fb4596e065d3ae85099f0886829d -5381cb80c2905550549406ddba3891bec541fc8e 2023-03-20T12:57:57+00:00 OCPBUGS-10003: Revert "NE-1115: Update haproxy container builds to use haproxy 2.6" -# kubernetes image-amd64 06e8c46c9f0d3f6bfcd1e146c09647e4b634e4eb to dc93b13d1f6518d62ea9e3dea64d843c2ce35cbf -916c65ebea0205d3c18d3701f48cf568ef9e7220 2023-03-17T23:03:18+00:00 UPSTREAM: 115328: annotate early and late requests -a6938113b34b64c0626efa322cd4d3c1132d64fb 2023-03-17T23:03:18+00:00 UPSTREAM: : Revert "UPSTREAM: : annotate audit events for requests during unready phase and graceful termination phase" -# oc image-arm64 eed143055ede731029931ad204b19cd2f565ef1a to 92b1a3d0e5d092430b523f6541aa0c504b2222b3 -32496b16599a0ee1d834a9d6685aca398d49c79d 2023-03-23T10:44:51+00:00 OCPBUGS-10622: bump repo sclorg/s2i-ruby-container location for newapp -# router image-arm64 69eda4bd427c3f27d9993afa35461f4fc1dc0357 to e28644631982fb4596e065d3ae85099f0886829d -5381cb80c2905550549406ddba3891bec541fc8e 2023-03-20T12:57:57+00:00 OCPBUGS-10003: Revert "NE-1115: Update haproxy container builds to use haproxy 2.6" -# ovn-kubernetes image-arm64 dd45efd39e5db428d4578ed6787e6c08b79e2df5 to ebb5dcaf65a49156b7ea220176fa5dd6f3e3f716 -f9632bfa3ca30fd6173f59cb7657bf910dd7719d 2023-03-23T09:40:51+08:00 Fix duplicated metric registration -eb64a87cca1ad699edfb9cda876602ebdeb69d8a 2023-03-22T17:30:51-04:00 Fix egress firewall CRD -dec0b99f54538591d1f8b6461940b609a29dc9d9 2023-03-17T10:53:58+00:00 Updating ovn-kubernetes-base images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/3ea7e6d582117c0c2b118319e4f4a4bd35edce51/images/ovn-kubernetes-base.yml -3baa3d367651fc620dbfa50c82c14c20f988db04 2023-03-08T02:28:51+00:00 Updating ovn-kubernetes-microshift images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/724eedd015d4972b55704e41a4117c533e240935/images/ovn-kubernetes-microshift.yml +# ovn-kubernetes image-arm64 ebb5dcaf65a49156b7ea220176fa5dd6f3e3f716 to cb89e52240fe7346409589a9acae9c0106d24b03 +8513b38e5a74c0c5f303dca30a27e6cc24bdf89c 2023-03-24T16:52:21+01:00 update to before-kube-1.26 bump +46d2b9e1a902cfde6ed0a85251b336f60b0876b6 2023-03-23T17:26:47+01:00 don't create acl if no namespace address sets are selected. Previously "ip4.dst == {}" match was created, and ovn-controller throws an error on such acl +7ab410d18906602b127ae54fc49fb9e70d80ba03 2023-03-23T17:26:40+01:00 Add PodSelectorAddressSet tests. +efa8741efd682bca78571cc71f0a5cb94e71449b 2023-03-23T17:26:34+01:00 Rework gressPolicy ACLs build: previously all gress policies with at least one selector had peerAddressSet, and empty gress (allow all) was identified by "gp.sizeOfAddressSet() > 0". Now we don't create address sets like that, therefore a new hasPeerSelector field was added to distinguish empty gress from the one that just doesn't have any address sets added yet. +e0c35b2619f4084a0babea4aa554f5018e52ef5a 2023-03-23T17:26:26+01:00 Add PodSelectorAddressSet object, that should be used to manage address sets for pod selector (network policy object is only responsible for local pods and peer namespace-only handlers). The locking mechanism is copied from networkPolicy. +4a03b84b53431d8147818f311bba63ea78d2a6dc 2023-03-23T17:26:19+01:00 Unlock shared default deny port group early, when no db changes required, to unlock other handlers from the same namespace. +06c9270dc3c69e8128d57a42b8def7b51ab1bbf8 2023-03-23T17:25:41+01:00 Add an option to enable scale metrics in kind +6d96be9e761aa544c3500c54508a61c102dbdd77 2023-03-23T17:25:30+01: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. diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 9472176459..842bae848d 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -23,6 +23,6 @@ https://github.com/openshift/oc image-arm64 92b1a3d0e5d092430b523f6541aa0c504b22 https://github.com/openshift/coredns image-arm64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb https://github.com/openshift/router image-arm64 e28644631982fb4596e065d3ae85099f0886829d https://github.com/openshift/kube-rbac-proxy image-arm64 0aa2830ed7359fd8cd0e2f7db0ed96a733c5990e -https://github.com/openshift/ovn-kubernetes image-arm64 ebb5dcaf65a49156b7ea220176fa5dd6f3e3f716 +https://github.com/openshift/ovn-kubernetes image-arm64 cb89e52240fe7346409589a9acae9c0106d24b03 https://github.com/openshift/kubernetes image-arm64 dc93b13d1f6518d62ea9e3dea64d843c2ce35cbf https://github.com/openshift/service-ca-operator image-arm64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a From 176c185ab10e6c64d98836aa21d41809a4cd1280 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 28 Mar 2023 05:37:34 +0000 Subject: [PATCH 3/3] update manifests --- assets/release/release-aarch64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 4e1b106fb0..f5bf2aef8a 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,12 +1,12 @@ { "release": { - "base": "4.13.0-0.nightly-arm64-2023-03-25-181910" + "base": "4.13.0-0.nightly-arm64-2023-03-27-214926" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f49c6749ca274cb45371fe9df6c8f7e93149a14c3ed7357100b8ec6c67e5689", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f68737e9d390c2b3b20fdd6442ce0e090812e5f4393d08f722fb231e01bf606", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9171422b4f573a367cd042a87a103f208375646c50ce0e830dc540fd30568712", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2925eb732f1153563c33e0debf142bc7c18fd861367d935242c102a10cbea37", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f26942b0de3317aeba0ebd345a5db6e6fa6807158e24491422bfa0f4b259aa3", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", "ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad6a1b1a01f928dad3ed9b1d1288c4d5e665868c1713ca54c64ff21ebe4fb8ca", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe1d1fa6f1515af43bdf7134c9726b4ec96f15afdeac1a29788edaacc972b3ba",