Skip to content

rebase-4.13.0-0.nightly-2023-03-28-014156_amd64-2023-03-28_arm64-2023-03-28 #1587

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

Merged
openshift-merge-robot merged 6 commits into from
Mar 31, 2023
Merged

rebase-4.13.0-0.nightly-2023-03-28-014156_amd64-2023-03-28_arm64-2023-03-28 #1587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5038016
update last_rebase.sh
Mar 29, 2023
9a4a03c
update changelog
Mar 29, 2023
39611a2
update microshift/go.mod
Mar 29, 2023
5872d11
update microshift/vendor
Mar 29, 2023
3cf26c2
update component images
Mar 29, 2023
b59050d
update manifests
Mar 29, 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
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.13.0-0.nightly-arm64-2023-03-27-214926"
"base": "4.13.0-0.nightly-arm64-2023-03-28-131444"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f49c6749ca274cb45371fe9df6c8f7e93149a14c3ed7357100b8ec6c67e5689",
Expand Down
14 changes: 7 additions & 7 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.13.0-0.nightly-2023-03-23-204038"
"base": "4.13.0-0.nightly-2023-03-28-014156"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84aba6cc9ed84cd95a85cbc1b240a0db907b4b3a24d556715a8e6fd77065936f",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b3035476ded4209f81be2ede369e88d36bea8d3f03193836bda1d8ef07c7613",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5acaed1deee8b25170f8809fa1094037fea118d2ca0a303c8ad1849170e0cc95",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28c8cc87355833e4d0a06be3bdbd3f1cfb5b9986e1504d23149df2fdd796557a",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:90d5de548e62036ca86387d04d3a09208c0c958510ae9e73d0450b5672e2db3e",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83d168862ea6c2f10887785a9ac9ada19cc899bf2990d2e773e330e80b02eb22",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd90f3aeec0063db7bec9707c7e276ae466ad980b9e362453d638fb01b59f649",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eee411798b259500dd2da36618caac211e46f28981bc4a7bfbeac68ce2e7c074",
"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:5ab6561dbe5a00a9b96e1c29818d8376c8e871e6757875c9cf7f48e333425065",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd970d579474f95de533c4eee7d5a28ece5bc4fe655367f15d2cfe4b7467a13f",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03594cca8fa68b1d406d0d1812d036d5c06d291aee9d3249c423e12394ace800",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d817698879f98bdb09f2cbfcdd33eddcbf906fc432caeaace27072ae2ab86bf",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f74348281fa0a0068b6b4defb8ad5a36aa765bdf419311738cecf9825ccd6276",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860",
"topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:9df24be671271f5ea9414bfd08e58bc2fa3dc4bc68075002f3db0fd020b58be0",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/openshift/api v0.0.0-20230208193339-068b2ae5534f
github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
github.com/openshift/client-go v0.0.0-20230120202327-72f107311084
github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e3463245
github.com/openshift/cluster-policy-controller v0.0.0-20230324020700-d02c85ab3203
github.com/openshift/library-go v0.0.0-20230222090221-582055a1d5c4
github.com/openshift/route-controller-manager v0.0.0-20230205134410-d7a8e22db412
github.com/pkg/errors v0.9.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,8 +606,8 @@ github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d h1:RR
github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/client-go v0.0.0-20230120202327-72f107311084 h1:66uaqNwA+qYyQDwsMWUfjjau8ezmg1dzCqub13KZOcE=
github.com/openshift/client-go v0.0.0-20230120202327-72f107311084/go.mod h1:M3h9m001PWac3eAudGG3isUud6yBjr5XpzLYLLTlHKo=
github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e3463245 h1:BoNt9Hemwyc32xX+CZZaNGegWEiN7bGTVk4XaRboO8k=
github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e3463245/go.mod h1:vlkRuwyRueLOQ/ZRRle+rCrh+YNoh+pzJm9WaN9e6mU=
github.com/openshift/cluster-policy-controller v0.0.0-20230324020700-d02c85ab3203 h1:rafkiE1rN2dQC0rq7q44mI4/69aEkcxmdpxVlwvTOPY=
github.com/openshift/cluster-policy-controller v0.0.0-20230324020700-d02c85ab3203/go.mod h1:vlkRuwyRueLOQ/ZRRle+rCrh+YNoh+pzJm9WaN9e6mU=
github.com/openshift/kubernetes v0.0.0-20230320215851-dc93b13d1f65 h1:KxRTY0GQUEGc61T5PInmFfDtmIcYBCLcHydOFeAmTzs=
github.com/openshift/kubernetes v0.0.0-20230320215851-dc93b13d1f65/go.mod h1:FFmjFkZxW22qBBjGCdvUj9MzYgHeh1t+7fG3n7162tM=
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230320215851-dc93b13d1f65 h1:R+QHGTVvds4UdDuNj3iM0DAptll1ZGTu+3CeBUVKY7U=
Expand Down
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/microshift_amd64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ plugin_dirs = [
# for community builds on top of OKD, this setting has no effect
[crio.image]
global_auth_file="/etc/crio/openshift-pull-secret"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd970d579474f95de533c4eee7d5a28ece5bc4fe655367f15d2cfe4b7467a13f"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d817698879f98bdb09f2cbfcdd33eddcbf906fc432caeaace27072ae2ab86bf"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
29 changes: 28 additions & 1 deletion scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,23 @@
# ovn-kubernetes image-arm64 ebb5dcaf65a49156b7ea220176fa5dd6f3e3f716 to cb89e52240fe7346409589a9acae9c0106d24b03
# cluster-kube-apiserver-operator embedded-component 3e62b53e39db960ccc16d717d1a25d751d4e9c49 to f2d9ccd2f585c57409257fae99da7f52ed6042cf
8110dfa09769bf3bf7877147512146296de1483c 2023-03-24T17:54:23+01:00 bump(api)
# cluster-kube-controller-manager-operator embedded-component 2a3e578c1007d7534eadffcca2adc979cb712995 to 280c115d63367f4ede8a4e893549cdc5919e8920
487b8546158cf243b30c1ed8bb5daeb2cf301087 2023-03-22T14:14:21+01:00 fix render test
7dd94053e9f79d445923c679af2c3dfb603e226b 2023-03-22T14:14:19+01:00 bump o/api for the updated featureflags
# cluster-kube-scheduler-operator embedded-component d3978864fb58063235be176c18fe50457b5223f3 to fbc6ef4df8b0d9ea97acf9b0330d44a3a171b4fd
20c9a9af04d84b932b9cecb25a2263960cf72893 2023-03-20T10:11:15-04:00 update vendor folder
4924d0c1a19c3300ce0ed2d06a0c49c6542d757c 2023-03-20T10:11:03-04:00 bump(library-go)
# cluster-network-operator embedded-component 040d5efed272789341b16858f63c2d0bcdb71b50 to ae70394d0198a1d5a310410ba3468f38ce0522c2
f9c32cf30aa63582adba034c90bf62a4ca0b6176 2023-03-22T13:55:35+00:00 operConfig reconcile can return nil error on failure
# cluster-policy-controller embedded-component ac01e3463245f2dd9312145368d7f4099a8a0bb9 to d02c85ab3203fe22eddcc4694e17504ef34935de
11d8891790e3c92405a3fb7c35b021d15b571053 2023-03-20T14:26:27+01:00 psalabelsyncer: invert the enforce/log logic to default to logging
# machine-config-operator embedded-component 40575b862f7bd42a2c40c8e6b7203cd4c29b0021 to a4e68fb1d5eed30d4c1b6f60e9385baf41a30bb3
09c94a511e2a6190ad2a64d43ec8f7ff11569be7 2023-03-15T19:57:23+00:00 e2e: add testing for cert rotation
6fcc0ed596861cc38fe36b843993c16efd4961af 2023-03-15T19:57:23+00:00 Remove paused pool kubelet ca alert metrics
70131ba52f71de6ac9634f10cec58c580a440cc4 2023-03-15T19:57:23+00:00 server: add path to also serve the latest kubelet ca
77fd8d39c0e49d05dbf68de9380b668531920940 2023-03-15T19:57:23+00:00 daemon: have a special path to sync in certs
# oc image-amd64 eed143055ede731029931ad204b19cd2f565ef1a to 92b1a3d0e5d092430b523f6541aa0c504b2222b3
32496b16599a0ee1d834a9d6685aca398d49c79d 2023-03-23T10:44:51+00:00 OCPBUGS-10622: bump repo sclorg/s2i-ruby-container location for newapp
# ovn-kubernetes image-amd64 dd45efd39e5db428d4578ed6787e6c08b79e2df5 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.
Expand All @@ -7,3 +26,11 @@ e0c35b2619f4084a0babea4aa554f5018e52ef5a 2023-03-23T17:26:26+01:00 Add PodSelect
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.
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 cb89e52240fe7346409589a9acae9c0106d24b03 to 9799fbc9bef06304e8195fbc4b37b2e095ec9325
74f95e997d116f572b64c7cf7775d483aeed86d1 2023-03-23T17:14:38+01:00 fix multiple error aggregation: `errors.Wrapf` always returns nil if the first argument is nil.
362fa553d572b418f5b305b9c8fb68eb1a4e13cc 2023-03-23T17:14:26+01:00 Fix egress firewall unit tests gatewayMode setup update "egress firewall with node selector updates during node update" to work for both gateway modes.
2e3d170c179fc806bfebbdaf1bab3f606a562ecf 2023-03-23T17:14:18+01:00 Egress firewall creation error was overridden by the status update error and never returned. That would prevent retry on failure.
18 changes: 9 additions & 9 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
https://github.com/openshift/cluster-dns-operator embedded-component d96022a4d0d091955d73e7e99fc8cc81db56c86a
https://github.com/openshift/cluster-ingress-operator embedded-component 6aa482c551de22016dc2b6c87ca11ef4ac2be04d
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 3e62b53e39db960ccc16d717d1a25d751d4e9c49
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 2a3e578c1007d7534eadffcca2adc979cb712995
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component d3978864fb58063235be176c18fe50457b5223f3
https://github.com/openshift/cluster-network-operator embedded-component 040d5efed272789341b16858f63c2d0bcdb71b50
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component f2d9ccd2f585c57409257fae99da7f52ed6042cf
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 280c115d63367f4ede8a4e893549cdc5919e8920
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component fbc6ef4df8b0d9ea97acf9b0330d44a3a171b4fd
https://github.com/openshift/cluster-network-operator embedded-component ae70394d0198a1d5a310410ba3468f38ce0522c2
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 7867c26e6c91e2cc279317dfc080befe63a60749
https://github.com/openshift/cluster-policy-controller embedded-component ac01e3463245f2dd9312145368d7f4099a8a0bb9
https://github.com/openshift/cluster-policy-controller embedded-component d02c85ab3203fe22eddcc4694e17504ef34935de
https://github.com/openshift/etcd embedded-component f70da9d78221bc3e6bf8ac14c0c4ecc106f4f57d
https://github.com/openshift/kubernetes embedded-component dc93b13d1f6518d62ea9e3dea64d843c2ce35cbf
https://github.com/openshift/machine-config-operator embedded-component 40575b862f7bd42a2c40c8e6b7203cd4c29b0021
https://github.com/openshift/machine-config-operator embedded-component a4e68fb1d5eed30d4c1b6f60e9385baf41a30bb3
https://github.com/openshift/openshift-controller-manager embedded-component 87de83867ac51730f506138ee790a56ca21d9fc9
https://github.com/openshift/route-controller-manager embedded-component d7a8e22db412b6fabb7028ca0da8de8f3d9ac3c3
https://github.com/openshift/service-ca-operator embedded-component 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a
https://github.com/openshift/oc image-amd64 eed143055ede731029931ad204b19cd2f565ef1a
https://github.com/openshift/oc image-amd64 92b1a3d0e5d092430b523f6541aa0c504b2222b3
https://github.com/openshift/coredns image-amd64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb
https://github.com/openshift/router image-amd64 e28644631982fb4596e065d3ae85099f0886829d
https://github.com/openshift/kube-rbac-proxy image-amd64 0aa2830ed7359fd8cd0e2f7db0ed96a733c5990e
https://github.com/openshift/ovn-kubernetes image-amd64 dd45efd39e5db428d4578ed6787e6c08b79e2df5
https://github.com/openshift/ovn-kubernetes image-amd64 cb89e52240fe7346409589a9acae9c0106d24b03
https://github.com/openshift/kubernetes image-amd64 dc93b13d1f6518d62ea9e3dea64d843c2ce35cbf
https://github.com/openshift/service-ca-operator image-amd64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a
https://github.com/openshift/oc image-arm64 92b1a3d0e5d092430b523f6541aa0c504b2222b3
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 cb89e52240fe7346409589a9acae9c0106d24b03
https://github.com/openshift/ovn-kubernetes image-arm64 9799fbc9bef06304e8195fbc4b37b2e095ec9325
https://github.com/openshift/kubernetes image-arm64 dc93b13d1f6518d62ea9e3dea64d843c2ce35cbf
https://github.com/openshift/service-ca-operator image-arm64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a
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.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"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-03-28-014156" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-03-28-131444" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12"
12 changes: 6 additions & 6 deletions vendor/github.com/openshift/cluster-policy-controller/pkg/cmd/controller/psalabelsyncer.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ github.com/openshift/client-go/user/informers/externalversions/internalinterface
github.com/openshift/client-go/user/informers/externalversions/user
github.com/openshift/client-go/user/informers/externalversions/user/v1
github.com/openshift/client-go/user/listers/user/v1
# github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e3463245
# github.com/openshift/cluster-policy-controller v0.0.0-20230324020700-d02c85ab3203
## explicit; go 1.19
github.com/openshift/cluster-policy-controller/pkg/client/genericinformers
github.com/openshift/cluster-policy-controller/pkg/cmd/cluster-policy-controller
Expand Down