From 072db76802ba467fcdb333b6defda099b2db2a2d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 25 Apr 2023 05:25:26 +0000 Subject: [PATCH 1/5] 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 3aeb6779a9..46db97fc55 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-04-18-005127" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-04-18-043011" "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-04-21-084440" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-04-21-150008" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" From dfad649441a58d6f5d5cc2baec812efe3ba0c9be Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 25 Apr 2023 05:25:27 +0000 Subject: [PATCH 2/5] update changelog --- scripts/auto-rebase/changelog.txt | 2 ++ scripts/auto-rebase/commits.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..67eac8b262 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,2 @@ +# cluster-network-operator embedded-component d9b70b9b587762e53863d61d0447f2f74580bd4b to 823319ac7f3f51593a0956d5ba44e9f385f4e6cf +f6b8d67ad7d622dee80f3ece0e468c2529e90093 2023-04-07T23:34:31+00:00 With Hypershift run as user passed from hypershift diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 10ccebaad5..ff683ad942 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 6aa482c https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 02ea4a4120dd0f8eb49d070b1fe420ed6d1debba https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component cdde94837bec1810dbad71ca070a84f212de0cbb https://github.com/openshift/cluster-kube-scheduler-operator embedded-component dc5cba57ddcdb5a4b43240d1c2ab908fa953d887 -https://github.com/openshift/cluster-network-operator embedded-component d9b70b9b587762e53863d61d0447f2f74580bd4b +https://github.com/openshift/cluster-network-operator embedded-component 823319ac7f3f51593a0956d5ba44e9f385f4e6cf https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 9a8aba8cad6491a31e743a7e366d758351482d88 https://github.com/openshift/cluster-policy-controller embedded-component d02c85ab3203fe22eddcc4694e17504ef34935de https://github.com/openshift/etcd embedded-component f70da9d78221bc3e6bf8ac14c0c4ecc106f4f57d From fa6286dea92f7e939e10909974e8a7ea0a2839e9 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 25 Apr 2023 05:28:51 +0000 Subject: [PATCH 3/5] update component images --- packaging/crio.conf.d/microshift_amd64.conf | 2 +- packaging/crio.conf.d/microshift_arm64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/crio.conf.d/microshift_amd64.conf b/packaging/crio.conf.d/microshift_amd64.conf index 77020d37f6..388b99dd0d 100644 --- a/packaging/crio.conf.d/microshift_amd64.conf +++ b/packaging/crio.conf.d/microshift_amd64.conf @@ -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:903b4ede73a392afe49e08f539e2fdd3f27cf247235b5f46d99266a3b9711574" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c3c1e09925601bb101aca93ffbf55d49999f55d9952578f5aa45c309cd05c58" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/microshift_arm64.conf b/packaging/crio.conf.d/microshift_arm64.conf index eb83bbf77c..8b8a3b877d 100644 --- a/packaging/crio.conf.d/microshift_arm64.conf +++ b/packaging/crio.conf.d/microshift_arm64.conf @@ -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:2e789671e0795fb9710418d5810e736775b6f5579375d4d7f470acda31528e28" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6c8a380aea09ee06e2a856620ad5bef26374e8e45a2b63e222b89109309be83" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From ecd470f059bb08e2d71c1ae8abc8e111bbb12885 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 25 Apr 2023 05:28:52 +0000 Subject: [PATCH 4/5] update manifests --- assets/release/release-aarch64.json | 14 +++++++------- assets/release/release-x86_64.json | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 516a8eceb2..a89ad7c747 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.13.0-0.nightly-arm64-2023-04-18-043011" + "base": "4.13.0-0.nightly-arm64-2023-04-21-150008" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd2e1c6dccbf1bfda3653b83eb0d34c84662c74565f7e070bbfcddf9e21f10c3", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c9ce8d0fd1ca92ccca5a4cad3466241595e621c5d85fa3c511a53d448e45f7e", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff50d1404acb73df1971fe174067e00a77a4073daa2be37428e7573306bba0a6", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45262e0f012c6164200943a0505748103c23ae1559cc79fb404a6804e4a416c9", + "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", + "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:2d200033f00b93660ccd079602f350c987b42a97e3ab16bed775d4ab9c85fb93", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2e789671e0795fb9710418d5810e736775b6f5579375d4d7f470acda31528e28", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e035535d64ed631d7faa889f16dc3b2162d088ba48defe9cd0d44fda71863a91", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6c8a380aea09ee06e2a856620ad5bef26374e8e45a2b63e222b89109309be83", + "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", "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", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 70c013800f..a68053faf9 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.13.0-0.nightly-2023-04-18-005127" + "base": "4.13.0-0.nightly-2023-04-21-084440" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd9969cec172266143b779e4fb7b4130ed89435bd95fb7682747aeae13065ee6", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dab7cbb4ec3c211fd6c109e5de9ed848d8b96b35a4622f019eb324fa12adeb4d", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5965979168568e6f4b6a79d195c4002941be7e7a250f9510e8e05c1d1deb68eb", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b63259b7d82bf64968d77c9222ee87911105aa7a971e7b0740b551ab5b3527b", + "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", + "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:7c8266e902ee5402689563a9bf6d623d39ede6dca9263407612618440d39fbe2", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:903b4ede73a392afe49e08f539e2fdd3f27cf247235b5f46d99266a3b9711574", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9783ff266388df6423e07a28f90b8a98761624663dc73c3544b92be647570800", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c3c1e09925601bb101aca93ffbf55d49999f55d9952578f5aa45c309cd05c58", + "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", "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", From acfdb386dd177646143f44837f70f69036f79ed9 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 25 Apr 2023 05:29:03 +0000 Subject: [PATCH 5/5] update buildfiles --- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index e28e2352d2..8b9da50280 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.13.0-0.nightly-arm64-2023-04-18-043011 +OCP_VERSION := 4.13.0-0.nightly-arm64-2023-04-21-150008 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 127e2b790e..7041b90272 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.13.0-0.nightly-2023-04-18-005127 +OCP_VERSION := 4.13.0-0.nightly-2023-04-21-084440