diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index b1ca8ac0c8..ea33f6c64f 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.13.0-0.nightly-arm64-2023-05-17-234114 +OCP_VERSION := 4.13.0-0.nightly-arm64-2023-05-18-192101 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index c9852d2af6..ec9748db22 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.13.0-0.nightly-2023-05-17-174018 +OCP_VERSION := 4.13.0-0.nightly-2023-05-18-195839 diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 75d2b7946a..7c34b4a8ab 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,14 +1,14 @@ { "release": { - "base": "4.13.0-0.nightly-arm64-2023-05-17-234114" + "base": "4.13.0-0.nightly-arm64-2023-05-18-192101" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25b1bb086a4eee276897911075a9034ddbf44d2ccce39c3c4b79cc59bfb6f226", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12a7b9e5d6bb21667dcf8e87435f32e3249e8c519793b6e7909e61cd3878c47c", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c74f1267e481b9d2838288a0c4c0d56d7326be3791d0de8fe5cb0c30bc83527e", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:168dfab7cbbec299af9b729c51255fc77f6e5f5b9cc1017904d42f21ee07bdf7", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b21d44f9b053592278a87f4dcd42ce35de5e66a4a0cbeb8e92cbe5f521285a2", "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:2e197be2408c85b26398a6c7026c742284e850a19b8d684248e2759184ad0198", + "ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22047b1588c632916bd741744643fec116b78ea9ed79230ff586cda5583c40d7", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2a89b27563e268eb3c5a16ff555fba061a9904abe5d65f5a39312e816a01776", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a89e4c39eeba38f2f48f8d40fd6cfbf3d2c407d1f6d9ea00be9e1456524e488a", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index b5e71788a2..c69474cfbe 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,14 +1,14 @@ { "release": { - "base": "4.13.0-0.nightly-2023-05-17-174018" + "base": "4.13.0-0.nightly-2023-05-18-195839" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:800f0bb464dc9d622c3a670e503bee267670395c9bea0fb6247737b6f826ba7d", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef20b93c7bad79e4fa20cecaf85af5a897342aefd133b5d2c693d74a4813df2c", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5460207dedbfc16cc26527f5fc7ccc8143242b1d4ca329476441cce3672a992b", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e0fd73f8c615cffe134f1dafaa756bf5674337ab7d50c49c9a313ce0a58eec26", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2b2c89aedaa44964e4cf003ef94963da2e773ace08e601592078adefa482b52", "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:50903c9b9f90d7487bdb1f35db9751705e70e1c6b7740582818d5afcccc34726", + "ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1625fc8b335143ae6e613699e9f72371b657031ec38024dba600e396da5af691", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09d4bee015dd9cdd168968be3fd91106af558e82cb8975191fb905d9f8825418", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ba8c66a65d8a7d32c7d6aec772d0cc88f65bf54b16664cfedf8e068c00689a4", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1", diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 1c916722d9..2f4914f118 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,13 +1,14 @@ -# cluster-ingress-operator embedded-component 6aa482c551de22016dc2b6c87ca11ef4ac2be04d to 7262c34b3a6434b49851ff5f0cceec87a2ee9706 -7015b26e3144dd744059a96e191763fe7aa694dc 2023-05-05T12:25:24+00:00 OCPBUGS-12913: Deflake TestRouterCompressionOperation -e0078fd9c69ac1d901456eaefdc802cd7fad8bf7 2023-05-03T19:55:53+00:00 waitForDeploymentCompleteWithOldPodTermination fix -2e514cb78daba4ac79ab6586fa0206c4db34cc58 2023-05-03T19:55:53+00:00 Rename waitForDeploymentCompleteWithCleanup to waitForDeploymentCompleteWithOldPodTermination -7bc9214b66b07c0301835eef7bccbbd19f8bcd8e 2023-05-03T19:55:53+00:00 Fix TestClientTLS: Wait for old router pods to be cleaned up before testing new mTLS config -# cluster-network-operator embedded-component 823319ac7f3f51593a0956d5ba44e9f385f4e6cf to fed9560d379fa9e178441642a69746a126ac39b5 -7ec99008e321deaa249e10ed14456e63f7a43ca1 2023-04-27T13:49:01+00:00 rbac: ovn-kubernetes: add aggregate-to-cluster-reader permissions -# machine-config-operator embedded-component 70aa0a560c0b0a01093f695cb358a8749d30b3d2 to f2cdca82301940d827f763dcdeaeb1d860c0bf6d -03479518cf796fdabe761d346351040d927f20b5 2023-05-09T16:29:08+00:00 daemon: event only on actual OS updates -# ovn-kubernetes image-amd64 49f6f059507ed04116d91d8f9e8dadd6fd1978d9 to 86284e6d4f67a4c56c9d6c2dc48e83f02ff84eef -d7e64a946b043da51237b3850b5a0d62c80e63dc 2023-04-25T17:07:58+02:00 Use loadbalancer.Name as client index Revert predicate search optimization 3369d387417ede05033c002b782b0279b201ea76 as predicate search should not bee needed anymore -# ovn-kubernetes image-arm64 49f6f059507ed04116d91d8f9e8dadd6fd1978d9 to 86284e6d4f67a4c56c9d6c2dc48e83f02ff84eef -d7e64a946b043da51237b3850b5a0d62c80e63dc 2023-04-25T17:07:58+02:00 Use loadbalancer.Name as client index Revert predicate search optimization 3369d387417ede05033c002b782b0279b201ea76 as predicate search should not bee needed anymore +# cluster-network-operator embedded-component fed9560d379fa9e178441642a69746a126ac39b5 to 3ed6bef191d49ede92ab8f7f684826a1b7967928 +fd324089e6266d3164e1982c090fc2bdabd5be72 2023-05-05T11:14:29+00:00 HyperShift: Add support for HostedControlPlane nodeSelector field +10462673af4afde8854a25334b0fd52f6ab862ae 2023-05-05T11:14:29+00:00 HyperShift: Retrieve HostedControlPlane as part of bootstrap process +65f31351f11e131ebfffa2191a66db495f23f553 2023-05-05T11:14:29+00:00 HyperShift: Move hypershift.go to platform package +63bc9cfb0cb4b80d357bae7bdd7802a290bca338 2023-05-05T11:14:29+00:00 Migrate to hypershift v1beta1 +79ac53c377b60d121c68019d3271a7448401d6a0 2023-05-05T11:14:29+00:00 Fix go mod. +c17476e3ee4cc9a190aa227aeb11af3f1584a8f6 2023-04-26T16:24:28+02:00 Fix priority class name on allowlist daemonset +247b33c837d91ece2cb0d81699943d0aa2eeee19 2023-04-26T16:24:28+02:00 Ensure pods are present for allowlist daemonset +14a718cf87a8ee27866f22eef97a22260286d29e 2023-04-26T16:24:28+02:00 Improve logging on allowlist controller +# machine-config-operator embedded-component f2cdca82301940d827f763dcdeaeb1d860c0bf6d to 230bb7e5f5620af293f3dc5b9740e01f5644262f +a46ecd83469dbec1c358935ba640d7c957260ec1 2023-04-28T16:32:06+00:00 Removed pivot func and added depreciation warning +079d89218ceac3d887920912d10790af41f5ae31 2023-04-26T14:48:32+00:00 Bug OCPBUGS-4476: keepalived/ingress: change healthcheck script +62de2db79f7a4668d4df8882ecfe906682802624 2023-04-03T16:37:38+00:00 OCPBUGS-10414: Fix regex dot in coredns config file +f4f2e8beb4035d0f10ab2cd7cb65c6d1e8092c68 2023-03-28T12:06:22+00:00 configure-ovs: support UUID in vlan.parent diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 7f7a79adbd..6ba4a02079 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -3,12 +3,12 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 7262c34 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 02ea4a4120dd0f8eb49d070b1fe420ed6d1debba https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 9f53628279a765cccb234b1ef992075ad7cddf96 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component dc5cba57ddcdb5a4b43240d1c2ab908fa953d887 -https://github.com/openshift/cluster-network-operator embedded-component fed9560d379fa9e178441642a69746a126ac39b5 +https://github.com/openshift/cluster-network-operator embedded-component 3ed6bef191d49ede92ab8f7f684826a1b7967928 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 9a8aba8cad6491a31e743a7e366d758351482d88 https://github.com/openshift/cluster-policy-controller embedded-component 20a47733b59ba746aa3c6410dca2d1a1ab6339de https://github.com/openshift/etcd embedded-component f70da9d78221bc3e6bf8ac14c0c4ecc106f4f57d https://github.com/openshift/kubernetes embedded-component b40493584076fb1ab29f3bed1d05d16cbc5b17f1 -https://github.com/openshift/machine-config-operator embedded-component f2cdca82301940d827f763dcdeaeb1d860c0bf6d +https://github.com/openshift/machine-config-operator embedded-component 230bb7e5f5620af293f3dc5b9740e01f5644262f 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 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 325daa845c..8eb447fc36 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-05-17-174018" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-05-17-234114" "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-05-18-195839" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-05-18-192101" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12"