diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 9b1ccd5494..ab045ed74d 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.13.0-0.nightly-arm64-2023-06-15-232303 +OCP_VERSION := 4.13.0-0.nightly-arm64-2023-06-20-232426 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index c4cd1f0ef1..8300edbcde 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.13.0-0.nightly-2023-06-15-164350 +OCP_VERSION := 4.13.0-0.nightly-2023-06-20-224158 diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 4f7106c573..fb2cce6a92 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.13.0-0.nightly-arm64-2023-06-15-232303" + "base": "4.13.0-0.nightly-arm64-2023-06-20-232426" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:538f9e1c5f97ecf850129d6452ab8e0b412501250a60195173eb257d09836612", @@ -8,7 +8,7 @@ "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55be64102a3a376fcb9a4b0f0b78774e6cdeb8bb406086d15d3e82f6d03ca65c", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aaa62efc0b760d4c214c6ece7f26e961021d70f542e5539d8697f110392a920e", "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:e8f0bbd295d66f275d2d8b8670b3ad75741bda54c1b91da0189a1ebac94fbce9", + "ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c42149bc1a2bba1b274f56a787dfa6792df779eca3c8bcc00b5e2d9a8c9125c3", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3051bbdee34556c4cdb55a86d239937d0983f573788a0a10828fa772a4449df6", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41aa8b8adfa3b8de797a8767ee7748fd8d9b5bca0936c1704d1541cf5056d2ee", "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 4fd969ded5..d66f09e255 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.13.0-0.nightly-2023-06-15-164350" + "base": "4.13.0-0.nightly-2023-06-20-224158" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0711c044ac086e51ab8319614bc172be3f4ad1db1e16db69a8d6965b57f74a23", @@ -8,7 +8,7 @@ "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:606c91ed7dc3e3f831dd2aaa45e2e43679f0598b6f7bc9fd67c228ec33d15d94", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:128a542e1ce40ba0682716c642d2d6b6526d94d6a099c9b99cae33a31d806b21", "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:0ef6e91fa4515d5acb23cdd8a2505b452e280d7c30f4c645528a7492b1749d0a", + "ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e24fe2d008533a2d456d30538e2baa65ee3b9dd34aded2936242f46b9ea41266", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d78843eceb06deef06a9a615b52ea1b248cdd1ac0ec2c6a016f5a12096b04a3", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:250110a48ffc05b091c69cb43e28c0a6c1c4f415f21adaaae27eb51dadd38431", "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 fd23aaa1f4..66a3a0f90c 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,6 +1,7 @@ -# machine-config-operator embedded-component 74ba23a6c90bb007b6b7cb0b5734b0c91c5fe3b6 to 95816efa5d37e980b65f65d98311ceeb8c946db7 -a42d60097bab5b4fbb89247645dbbd877fe710aa 2023-05-09T16:28:34+00:00 daemon: write certs in firstboot-complete path -# ovn-kubernetes image-amd64 a69523609f7bbfa2a487e0d1bef52e194c282f90 to 6a2a027e6bd46d43ca05c6259d2ea08147f2f47f -cfccce3a3762dc542b0b8869217f609a77cf4c8a 2023-06-02T09:44:10-05:00 Dockerfiles: sync RHEL9 dockerfiles to regular ones -# ovn-kubernetes image-arm64 a69523609f7bbfa2a487e0d1bef52e194c282f90 to 6a2a027e6bd46d43ca05c6259d2ea08147f2f47f -cfccce3a3762dc542b0b8869217f609a77cf4c8a 2023-06-02T09:44:10-05:00 Dockerfiles: sync RHEL9 dockerfiles to regular ones +# cluster-network-operator embedded-component 924fd3c589f0dc345807550965ef80099311b82a to cf774f4844621d058b951457a4068aeb3e1e609e +ff5d378a5e8a9af3d20692d11c1b9270549d075e 2023-06-12T19:27:03+00:00 Do not determine if HyperShift is enabled based on the ControlPlaneTopology value +cfdebe8dca3e6b74109a00683480f1c82c956ae9 2023-05-18T19:15:03+00:00 Use `IfNotPresent` instead of `Always` in OVNK upgrades pre-puller +# ovn-kubernetes image-amd64 6a2a027e6bd46d43ca05c6259d2ea08147f2f47f to 723ce848a1a3f1a699409d0c2e5ff52114e5be89 +cd99b41e441a917e51f983f69d34578167293395 2023-06-18T17:49:56+02:00 Fix stale SNAT entries for completed pods +# ovn-kubernetes image-arm64 6a2a027e6bd46d43ca05c6259d2ea08147f2f47f to 723ce848a1a3f1a699409d0c2e5ff52114e5be89 +cd99b41e441a917e51f983f69d34578167293395 2023-06-18T17:49:56+02:00 Fix stale SNAT entries for completed pods diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 0796c39a8a..bb980ad820 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -3,7 +3,7 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 052f416 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 02ea4a4120dd0f8eb49d070b1fe420ed6d1debba https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 56b970786d152344f0d4762c8271d20e5fc9d28b https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 5c00da0816faf0f15e643f05666c963d862a8299 -https://github.com/openshift/cluster-network-operator embedded-component 924fd3c589f0dc345807550965ef80099311b82a +https://github.com/openshift/cluster-network-operator embedded-component cf774f4844621d058b951457a4068aeb3e1e609e https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 9a8aba8cad6491a31e743a7e366d758351482d88 https://github.com/openshift/cluster-policy-controller embedded-component 8d2af85d0b6dcf09256bd9fecc5d36ac77bc41d1 https://github.com/openshift/etcd embedded-component f70da9d78221bc3e6bf8ac14c0c4ecc106f4f57d @@ -16,13 +16,13 @@ https://github.com/openshift/oc image-amd64 05d83eff7e17160e679898a2a5cd6019ec25 https://github.com/openshift/coredns image-amd64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb https://github.com/openshift/router image-amd64 065deab84f342615db2d2f5c78a19ae04bb43912 https://github.com/openshift/kube-rbac-proxy image-amd64 11b1439d48a47a408ae7e2dd851989f7b7b4f595 -https://github.com/openshift/ovn-kubernetes image-amd64 6a2a027e6bd46d43ca05c6259d2ea08147f2f47f +https://github.com/openshift/ovn-kubernetes image-amd64 723ce848a1a3f1a699409d0c2e5ff52114e5be89 https://github.com/openshift/kubernetes image-amd64 7d221229dc97969b79a272b63ad97b84d93cddb2 https://github.com/openshift/service-ca-operator image-amd64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a https://github.com/openshift/oc image-arm64 05d83eff7e17160e679898a2a5cd6019ec252c49 https://github.com/openshift/coredns image-arm64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb https://github.com/openshift/router image-arm64 065deab84f342615db2d2f5c78a19ae04bb43912 https://github.com/openshift/kube-rbac-proxy image-arm64 11b1439d48a47a408ae7e2dd851989f7b7b4f595 -https://github.com/openshift/ovn-kubernetes image-arm64 6a2a027e6bd46d43ca05c6259d2ea08147f2f47f +https://github.com/openshift/ovn-kubernetes image-arm64 723ce848a1a3f1a699409d0c2e5ff52114e5be89 https://github.com/openshift/kubernetes image-arm64 7d221229dc97969b79a272b63ad97b84d93cddb2 https://github.com/openshift/service-ca-operator image-arm64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 49da36a19e..40c63ced58 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-06-15-164350" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-06-15-232303" "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-06-20-224158" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-06-20-232426" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12"