From 4cf667e6fa14874fcb2ba6b50c2a386621a941f4 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 27 Jun 2023 05:11:45 +0000 Subject: [PATCH 1/4] 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 f8fce300f2..9f68d1cbab 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.12.0-0.nightly-2023-06-25-204934" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-06-25-204935" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-06-26-100619" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-06-26-235841" From 521225f6ee36597ddda90df2c297cc5faf292490 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 27 Jun 2023 05:11:45 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 82 ------------------------------- 1 file changed, 82 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index f7fc476b35..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,82 +0,0 @@ -# cluster-network-operator embedded-component df823f355353ae0fabc51e3e6ae71c47d1b66d1d to 88b572015b92a5b9cfe679ce56394c1a78d9c71f -4e7b1b5db99571f8b5f65fdedae358eb945ea0a5 2023-06-14T13:56:36+02:00 Do not determine if HyperShift is enabled based on the ControlPlaneTopology value -6ad1fceea5edaf7adda9dd9325808120795e937e 2023-05-29T13:40:18+02:00 HyperShift: Add support for HostedControlPlane nodeSelector field -a5c7bc7bab2ca4d9d83aab24953d8e4a30b8abb0 2023-05-29T13:40:18+02:00 HyperShift: Retrieve HostedControlPlane as part of bootstrap process -d40981bf6b56e350f776d4f639be6d73ddef10a5 2023-05-29T13:40:18+02:00 HyperShift: Move hypershift.go to platform package -667e48d735b0eae419ebfde8d329df085d59d5e9 2023-05-29T13:40:17+02:00 Migrate to hypershift v1beta1 -9049a7663e3c49e601c9e7a23d4af2df25c96e26 2023-05-29T13:39:46+02:00 Bump hypershift dependency to v0.1.2 -# kubernetes embedded-component 8c210201e58450becf3834a4fb9dcd520ab54679 to c43ddea5eec2220b3e691afe6a2f1529e0a454cd -8b8d4e84f27acdb9c1c0693b0e6c52d3d5c8605a 2023-06-22T17:24:14+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image -27a378f7a0f08ddada4dd6bf8915ccd24facdaa7 2023-06-22T15:22:10+00:00 UPSTREAM: : manually resolve conflicts -8cfcba0b15c343a8dc48567a74c29ec4844e0b9e 2023-06-14T09:47:35+00:00 Release commit for Kubernetes v1.25.11 -61254725a43ce127f1ffe99b0df766415e2e7aa8 2023-06-08T00:18:54-06:00 update-vendor: update vendored go.sums -79bcb106a768afb57cf147126479e7354f0e169c 2023-06-07T23:50:33-06:00 [release-1.25] releng/go: Update images, deps and ver to go 1.19.10 -fba66ccd049e3823afbff40aff40f4b0c3319932 2023-06-06T21:20:11+00:00 kube-proxy avoid race condition using LocalModeNodeCIDR -8781d503a08ff8a1a29179c80252470ac77b3bd5 2023-06-05T13:36:07-07:00 Add ephemeralcontainer to imagepolicy securityaccount admission plugin -c0cd9cc82915b6eab0fca254eae80e551100cc6b 2023-05-23T14:32:04-04:00 Switch to assert.ErrorEquals from assert.Equal to check error equality -788b3de7a70c5ef859d6d20fae6795e463a81f8e 2023-05-23T00:23:59+08:00 update webhook test to go 1.21 -8f7a971aa20cda8b4b473ee243f710c931495486 2023-05-18T14:03:31-04:00 Test APIService safe handling at startup -9e3ad13051ebb38d994bd3fad88325e2cdcb1aef 2023-05-18T12:51:47-04:00 Fix waiting for CRD sync at server start -fa797f82fdfb2ef53d30d193a5e23dc9cd538f3b 2023-05-18T23:03:15+08:00 kubeadm: fix a bug where the static pod changes detection logic is inconsistent with kubelet -19d3546843f4561153b3327d517cffc45290642f 2023-05-17T14:27:30+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.10 -df8dde018682e33760d28e8736d88d546233d516 2023-05-16T15:40:10-07:00 kubeadm: Make etcd member removal idempotent -c079b7d70a2413548b89e6f9bcbe9dd56818c6f1 2023-05-16T15:40:08-07:00 kubeadm: Add etcd client unit tests -96d31bc648a5f29dd3dbcba3fb1b4ff76c2d0353 2023-05-16T15:40:08-07:00 kubeadm: Use internal etcd client through an interface -fa1445a07f81204f6bd2f8600a11a68ca039624d 2023-03-10T12:47:30+05:30 vclib: Modify x509.UnknownAuthorityError unwrap check -7f61dcb611d74c6653d9525394a2bd6076ef6e46 2023-03-10T12:47:29+05:30 vsphere: Adapt to govmomi version bumps -0ef4b72cf0cfec94fecc80d78f149d9eb56a6a10 2023-03-10T12:47:29+05:30 *: Bump version of vmware/govmomi -f560b86429bb7b845fbdb5c8f137f358030eac1d 2022-10-13T11:51:20-04:00 kubelet/stats: drop makePodStorageStats errors to V(6) -332b0175dc4c727cfa648540cbec3ee0b63bf129 2022-10-13T11:51:09-04:00 kubelet/stats: deduplicate makePodStorageStats -# machine-config-operator embedded-component 4accd895aa8fe5ccbd166b9562fdcf5a2112c5ec to 01f999aa710dd62d43bee8cf1e2ca6a226c7dce3 -aeeb0b0bbbdb43c1f2f230a17262037a0295ba16 2023-04-03T16:38:19+00:00 OCPBUGS-10414: Fix regex dot in coredns config file -# oc image-amd64 55f2e3c2dbb865cf6b6b365ba01a2cf19bfc44e7 to ea7c11aac7fa39d9eb733b62251ee1bc4a242c99 -fc5e0d8cb4afbf915148d980e67ba38a53cbdf41 2023-06-21T19:02:22+00:00 handle the error case of node retrieval while waiting for reboot -# ovn-kubernetes image-amd64 fec58c449e8fc691aff537ef64576e204b7191c3 to 17f9ed57beb21648ed53e5c360a6ad35f3791091 -c8c33964d1fdce253008de37cf7bbe640e878c53 2023-06-16T10:28:48-04:00 Validate port before deleting conntrack flow -b57eb3ecc9892aa43c6709314304b1ba460f35d9 2023-05-24T17:32:35+00:00 OCPBUGS-12971:Fix bug that resulted in routes not be restored to a new vnic -# kubernetes image-amd64 8c210201e58450becf3834a4fb9dcd520ab54679 to c43ddea5eec2220b3e691afe6a2f1529e0a454cd -8b8d4e84f27acdb9c1c0693b0e6c52d3d5c8605a 2023-06-22T17:24:14+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image -27a378f7a0f08ddada4dd6bf8915ccd24facdaa7 2023-06-22T15:22:10+00:00 UPSTREAM: : manually resolve conflicts -8cfcba0b15c343a8dc48567a74c29ec4844e0b9e 2023-06-14T09:47:35+00:00 Release commit for Kubernetes v1.25.11 -61254725a43ce127f1ffe99b0df766415e2e7aa8 2023-06-08T00:18:54-06:00 update-vendor: update vendored go.sums -79bcb106a768afb57cf147126479e7354f0e169c 2023-06-07T23:50:33-06:00 [release-1.25] releng/go: Update images, deps and ver to go 1.19.10 -fba66ccd049e3823afbff40aff40f4b0c3319932 2023-06-06T21:20:11+00:00 kube-proxy avoid race condition using LocalModeNodeCIDR -8781d503a08ff8a1a29179c80252470ac77b3bd5 2023-06-05T13:36:07-07:00 Add ephemeralcontainer to imagepolicy securityaccount admission plugin -c0cd9cc82915b6eab0fca254eae80e551100cc6b 2023-05-23T14:32:04-04:00 Switch to assert.ErrorEquals from assert.Equal to check error equality -788b3de7a70c5ef859d6d20fae6795e463a81f8e 2023-05-23T00:23:59+08:00 update webhook test to go 1.21 -8f7a971aa20cda8b4b473ee243f710c931495486 2023-05-18T14:03:31-04:00 Test APIService safe handling at startup -9e3ad13051ebb38d994bd3fad88325e2cdcb1aef 2023-05-18T12:51:47-04:00 Fix waiting for CRD sync at server start -fa797f82fdfb2ef53d30d193a5e23dc9cd538f3b 2023-05-18T23:03:15+08:00 kubeadm: fix a bug where the static pod changes detection logic is inconsistent with kubelet -19d3546843f4561153b3327d517cffc45290642f 2023-05-17T14:27:30+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.10 -df8dde018682e33760d28e8736d88d546233d516 2023-05-16T15:40:10-07:00 kubeadm: Make etcd member removal idempotent -c079b7d70a2413548b89e6f9bcbe9dd56818c6f1 2023-05-16T15:40:08-07:00 kubeadm: Add etcd client unit tests -96d31bc648a5f29dd3dbcba3fb1b4ff76c2d0353 2023-05-16T15:40:08-07:00 kubeadm: Use internal etcd client through an interface -fa1445a07f81204f6bd2f8600a11a68ca039624d 2023-03-10T12:47:30+05:30 vclib: Modify x509.UnknownAuthorityError unwrap check -7f61dcb611d74c6653d9525394a2bd6076ef6e46 2023-03-10T12:47:29+05:30 vsphere: Adapt to govmomi version bumps -0ef4b72cf0cfec94fecc80d78f149d9eb56a6a10 2023-03-10T12:47:29+05:30 *: Bump version of vmware/govmomi -f560b86429bb7b845fbdb5c8f137f358030eac1d 2022-10-13T11:51:20-04:00 kubelet/stats: drop makePodStorageStats errors to V(6) -332b0175dc4c727cfa648540cbec3ee0b63bf129 2022-10-13T11:51:09-04:00 kubelet/stats: deduplicate makePodStorageStats -# ovn-kubernetes image-arm64 48c7db9d8f3d90164e9c1134a6a5515ecc647357 to 17f9ed57beb21648ed53e5c360a6ad35f3791091 -c8c33964d1fdce253008de37cf7bbe640e878c53 2023-06-16T10:28:48-04:00 Validate port before deleting conntrack flow -# kubernetes image-arm64 8c210201e58450becf3834a4fb9dcd520ab54679 to c43ddea5eec2220b3e691afe6a2f1529e0a454cd -8b8d4e84f27acdb9c1c0693b0e6c52d3d5c8605a 2023-06-22T17:24:14+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image -27a378f7a0f08ddada4dd6bf8915ccd24facdaa7 2023-06-22T15:22:10+00:00 UPSTREAM: : manually resolve conflicts -8cfcba0b15c343a8dc48567a74c29ec4844e0b9e 2023-06-14T09:47:35+00:00 Release commit for Kubernetes v1.25.11 -61254725a43ce127f1ffe99b0df766415e2e7aa8 2023-06-08T00:18:54-06:00 update-vendor: update vendored go.sums -79bcb106a768afb57cf147126479e7354f0e169c 2023-06-07T23:50:33-06:00 [release-1.25] releng/go: Update images, deps and ver to go 1.19.10 -fba66ccd049e3823afbff40aff40f4b0c3319932 2023-06-06T21:20:11+00:00 kube-proxy avoid race condition using LocalModeNodeCIDR -8781d503a08ff8a1a29179c80252470ac77b3bd5 2023-06-05T13:36:07-07:00 Add ephemeralcontainer to imagepolicy securityaccount admission plugin -c0cd9cc82915b6eab0fca254eae80e551100cc6b 2023-05-23T14:32:04-04:00 Switch to assert.ErrorEquals from assert.Equal to check error equality -788b3de7a70c5ef859d6d20fae6795e463a81f8e 2023-05-23T00:23:59+08:00 update webhook test to go 1.21 -8f7a971aa20cda8b4b473ee243f710c931495486 2023-05-18T14:03:31-04:00 Test APIService safe handling at startup -9e3ad13051ebb38d994bd3fad88325e2cdcb1aef 2023-05-18T12:51:47-04:00 Fix waiting for CRD sync at server start -fa797f82fdfb2ef53d30d193a5e23dc9cd538f3b 2023-05-18T23:03:15+08:00 kubeadm: fix a bug where the static pod changes detection logic is inconsistent with kubelet -19d3546843f4561153b3327d517cffc45290642f 2023-05-17T14:27:30+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.10 -df8dde018682e33760d28e8736d88d546233d516 2023-05-16T15:40:10-07:00 kubeadm: Make etcd member removal idempotent -c079b7d70a2413548b89e6f9bcbe9dd56818c6f1 2023-05-16T15:40:08-07:00 kubeadm: Add etcd client unit tests -96d31bc648a5f29dd3dbcba3fb1b4ff76c2d0353 2023-05-16T15:40:08-07:00 kubeadm: Use internal etcd client through an interface -fa1445a07f81204f6bd2f8600a11a68ca039624d 2023-03-10T12:47:30+05:30 vclib: Modify x509.UnknownAuthorityError unwrap check -7f61dcb611d74c6653d9525394a2bd6076ef6e46 2023-03-10T12:47:29+05:30 vsphere: Adapt to govmomi version bumps -0ef4b72cf0cfec94fecc80d78f149d9eb56a6a10 2023-03-10T12:47:29+05:30 *: Bump version of vmware/govmomi -f560b86429bb7b845fbdb5c8f137f358030eac1d 2022-10-13T11:51:20-04:00 kubelet/stats: drop makePodStorageStats errors to V(6) -332b0175dc4c727cfa648540cbec3ee0b63bf129 2022-10-13T11:51:09-04:00 kubelet/stats: deduplicate makePodStorageStats From af89f0c4f134cfa7c1c56ea14c21a3c5a8cf8ccc Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 27 Jun 2023 05:12:27 +0000 Subject: [PATCH 3/4] update component images --- packaging/crio.conf.d/microshift_arm64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crio.conf.d/microshift_arm64.conf b/packaging/crio.conf.d/microshift_arm64.conf index ac76766e1e..b3199edcad 100644 --- a/packaging/crio.conf.d/microshift_arm64.conf +++ b/packaging/crio.conf.d/microshift_arm64.conf @@ -15,4 +15,4 @@ 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:de120740482436f4e6ddd4a8435d235e299355745e6e0a985a107c3b6b479f89" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e997d565ede5a590353e82c0e3bc229be0c215f85260ec7e96cb68cdc6edc989" From 419fdeebf94d59c6711c941333b0c225b526c716 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 27 Jun 2023 05:12:28 +0000 Subject: [PATCH 4/4] update manifests --- assets/release/release-aarch64.json | 24 ++++++++++++------------ assets/release/release-x86_64.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 8a4e613fd6..bdf1606caf 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,20 +1,20 @@ { "release": { - "base": "4.12.0-0.nightly-arm64-2023-06-25-204935" + "base": "4.12.0-0.nightly-arm64-2023-06-26-235841" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97e93b613ada17a5730567562b62445eb17d7532e5ec7a10e4fcacc605aa4dbd", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:efe4c7aeaf1333486202692e3c4c1da9bcbddd298bf07a4bbe9063d67d50d97e", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f326a0a3cbfb978d4dcbe8ba88a0861607add4e674bff66b4aa5b74a25799580", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2c4cce299459f98cbd0e5bf796c34b17fbe052136f5d841d988a58801d281c3", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b414a28b4d3272f9ff2e399af83c62cd157a189ab1345d91d5f005aa1885d6b1", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:215bdd692a45ec218bf0d044fb220a58b2691224780a0fcb12a16c68c325ff64", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:653b7592d7a2f90f7574c7d19d208ce1f7f7b6c9425e28a04e85a6f49eeaa69a", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04708f95b3b4417e8564d40eef4d63c3e287dc1d8b38ffbd6b942e65017417b7", "lvms-topolvm": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:74ea029440b21295857e8ca0d6016c3dd7a76ce2bd61bc99ad871a103035ec9b", - "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:24302d259c08d9bdaece2917a26df641fdf60f1ba1490f0f7aaccd311d7c4d94", - "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99949b2fdcb58dfc2a763131ad81d71c3e6535b055f4e48ab3d6bddfc45be929", - "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3daf5129584c125687fed004139a5e0c892aef92d7003801d648ee370acf01af", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f584cd2e582cfd09e5856724877daa04be94884f10ac33313f970463ed600c3", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:de120740482436f4e6ddd4a8435d235e299355745e6e0a985a107c3b6b479f89", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b96d16e0664806ce048b2e782d742639b8be05f535d5f823f1addbdf50a44904" + "csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dbbdc5f5ad273aeba769e9be532e84275de51d2c56e4a9bc13b71a9d1295663e", + "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1bd1a683ac957afdd40120bc06983bf75eddbc1c9ac4d16bde1456c800ed368a", + "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d077340d80622cfecf98935f3536a96fbd22ad94a6640dcb5f16408b88062b64", + "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf8d21ff9a3cc53efced7a196b1c8be2637746e00a91f4ff2917ab4499b346a2", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:46bd72b34ca0664095e5f1b951fb56bafae45588affe5b5f2efd7a09986774d2", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e997d565ede5a590353e82c0e3bc229be0c215f85260ec7e96cb68cdc6edc989", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db078b01e116e73ae91a7fdf746986e48dc595f4e8d145d3e438b2a5136587d7" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index a40af11944..5698a8850a 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.12.0-0.nightly-2023-06-25-204934" + "base": "4.12.0-0.nightly-2023-06-26-100619" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f8c3d97695331a52b44f669c63509a75f10308edcb4bc9f1de94f30b47e20491",