From cd72b44c2c6ce82b5cb41d8036d2f3fcb65d7f7c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 13 Feb 2023 05:19:32 +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 9de7decdf0..a0697f27fb 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-02-04-034821" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-02-07-004007" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-02-11-110819" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-02-11-153144" From 55af6f82e521b3e5d22eface819f62ea95ba5f38 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 13 Feb 2023 05:19:33 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 17 ++++++++++++++++- scripts/auto-rebase/commits.txt | 8 ++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 55734b61a1..dccb9843eb 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,5 +1,20 @@ -# ovn-kubernetes image-arm64 abcf2f9980650a56dceac6466960197bf71b78c4 to 63ad553a4e09d78d60e1034afbfb20d828b7596f +# cluster-network-operator embedded-component 68d109ac3b8605525c2aabc29789415bc302c9c7 to db00b4b6bab11ec3a27451cbf3c8597889e6e5da +981a9f2dee0bbe5df3ae3e07a761dab1d9d70dc9 2022-12-13T11:34:22+00:00 Fix handling of deployment and statefulset updates +# machine-config-operator embedded-component c64063fdf001360cbc2af4e9ec591fb4f3448f37 to 1fab7126698c52ba8e56ab1267b7aa3e7ab3e657 +c09ef80eb934c1130dc73b2b403913824ddd2984 2023-02-08T23:39:58+00:00 helpers_test: add unit test for default file overwrite +70d8c548e4d358676ca6278384209ebca7d1b93d 2023-02-08T23:39:58+00:00 controller: default overwrite to true for files +b27db22d1b4d73cf3a699c87a3f608362fe87f2f 2023-02-02T17:53:16-05:00 Run gofmt -s -w with 1.19 for verify job +31826c9d8bd1a31ea68a347ec40051beb51d1820 2023-02-02T16:05:52-05:00 Replace deprecated ioutil with os and io functions +b9f8fd8a61a5e14d368c54b54e7437f1007e8b09 2023-02-02T16:02:29-05:00 Update 4.12 images to go 1.19 base +ed86f924b01499175181999498271c0395b5a1e8 2023-02-02T10:40:19+00:00 configure-ovs: optionally generate configuration in /run +fb86b31cd89d9aaf3b54452e9688bd69c9c29015 2023-01-30T11:35:11+00:00 NetworkManager: clean state generated by NM initrd +# ovn-kubernetes image-amd64 e5fff733e0936d3ce30633f41d402da82e173186 to 38cd36f558a793a46f4f46684adccb12f5a8b59b d65b4240266a54d732d885ab34c5128c62c8565c 2023-02-02T17:09:57+08:00 generate more-pkgs with sed cmd in Dockerfile.base c1f1b9a9cf33fd42c890937d21f446b585e5a909 2023-02-02T08:47:42+08:00 Update base image of Dockerfile d72f55630e174e446df8780ad93e9a7fba52a76c 2023-01-31T10:45:58+00:00 Fixup egress fw tcs after modification of ACL match output 8b5f7f16e88d71f899ccccec12b55d46de186e73 2023-01-31T10:45:47+00:00 Fix egress firewall cluster exclusion in dualstack +dcbf9ca4e2565ba2fcef931aa1c18589a3d77e92 2023-01-25T11:58:10+01:00 Drop in-cluster traffic towards svcCIDR at wrong port +011ae64c8ef4331fd83c8cbcdf226e53ac770085 2023-01-24T11:01:24+01:00 ovnkube-trace: run ovn-sbctl and ovn-trace with --no-leader-only +34bfbfa3fe4f24d1e88eafa3f703930a92c62faa 2023-01-12T10:38:52-05:00 Correct the deletion of noHostSubnet nodes +# ovn-kubernetes image-arm64 63ad553a4e09d78d60e1034afbfb20d828b7596f to 38cd36f558a793a46f4f46684adccb12f5a8b59b +dcbf9ca4e2565ba2fcef931aa1c18589a3d77e92 2023-01-25T11:58:10+01:00 Drop in-cluster traffic towards svcCIDR at wrong port diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index aaf02123fd..1b62f137e3 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 992b43b https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 336ffd5e7491f565faccf843571303377b1d4825 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 9243e022c42c6d55e1d97a15ed51831f6080984a https://github.com/openshift/cluster-kube-scheduler-operator embedded-component e0b6bf9c4ddb0da9268d504d23ca2ca11880d970 -https://github.com/openshift/cluster-network-operator embedded-component 68d109ac3b8605525c2aabc29789415bc302c9c7 +https://github.com/openshift/cluster-network-operator embedded-component db00b4b6bab11ec3a27451cbf3c8597889e6e5da https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component d1915d130481541b8bacb5b98eddbc1541809d0a https://github.com/openshift/cluster-policy-controller embedded-component 105cc773b37f00be2351c9a4e6df24af94d547c1 https://github.com/openshift/etcd embedded-component 978cfefd2f21c4ec1ac84ed95130cbff510fbe1b https://github.com/openshift/kubernetes embedded-component a34b9e9499e6c3a94e2326652bd8236a5378c0b2 -https://github.com/openshift/machine-config-operator embedded-component c64063fdf001360cbc2af4e9ec591fb4f3448f37 +https://github.com/openshift/machine-config-operator embedded-component 1fab7126698c52ba8e56ab1267b7aa3e7ab3e657 https://github.com/openshift/openshift-controller-manager embedded-component b6528f9ea28164af9f1ceea0e50f18116fe3c90e https://github.com/openshift/route-controller-manager embedded-component 9e74d175e81ef6a2beb3718398e3fc99dded037c https://github.com/openshift/service-ca-operator embedded-component 299b7097a49385fdd4f86eccedc07f3a192e2504 @@ -20,7 +20,7 @@ https://github.com/openshift/csi-livenessprobe image-amd64 720e1d6e3e828dec99080 https://github.com/openshift/csi-node-driver-registrar image-amd64 805d5ac247137b02e6081e3eb7aa1fb9f4c7b4b2 https://github.com/openshift/router image-amd64 3065f6583f3925328fbdbfe95e3bc7bb7a084d33 https://github.com/openshift/kube-rbac-proxy image-amd64 513fd32175af4bb03f2e8a31030477e63380b5bc -https://github.com/openshift/ovn-kubernetes image-amd64 e5fff733e0936d3ce30633f41d402da82e173186 +https://github.com/openshift/ovn-kubernetes image-amd64 38cd36f558a793a46f4f46684adccb12f5a8b59b https://github.com/openshift/kubernetes image-amd64 a34b9e9499e6c3a94e2326652bd8236a5378c0b2 https://github.com/openshift/service-ca-operator image-amd64 299b7097a49385fdd4f86eccedc07f3a192e2504 https://github.com/openshift/oc image-arm64 b05f7d40f9a2dac30771be620e9e9148d26ffd07 @@ -31,6 +31,6 @@ https://github.com/openshift/csi-livenessprobe image-arm64 720e1d6e3e828dec99080 https://github.com/openshift/csi-node-driver-registrar image-arm64 805d5ac247137b02e6081e3eb7aa1fb9f4c7b4b2 https://github.com/openshift/router image-arm64 3065f6583f3925328fbdbfe95e3bc7bb7a084d33 https://github.com/openshift/kube-rbac-proxy image-arm64 513fd32175af4bb03f2e8a31030477e63380b5bc -https://github.com/openshift/ovn-kubernetes image-arm64 63ad553a4e09d78d60e1034afbfb20d828b7596f +https://github.com/openshift/ovn-kubernetes image-arm64 38cd36f558a793a46f4f46684adccb12f5a8b59b https://github.com/openshift/kubernetes image-arm64 a34b9e9499e6c3a94e2326652bd8236a5378c0b2 https://github.com/openshift/service-ca-operator image-arm64 299b7097a49385fdd4f86eccedc07f3a192e2504 From 7d07c0aa49c1ffd5444519045c387e2e62468698 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 13 Feb 2023 05:20:33 +0000 Subject: [PATCH 3/4] update component images --- packaging/crio.conf.d/microshift_amd64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crio.conf.d/microshift_amd64.conf b/packaging/crio.conf.d/microshift_amd64.conf index 4d9226ec91..6ee0f3ea13 100644 --- a/packaging/crio.conf.d/microshift_amd64.conf +++ b/packaging/crio.conf.d/microshift_amd64.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:847027714e33fd897a4212811c881ec8c736e068c9a81b968346c3e5c90b3c8b" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be64c744b92d1b1df463d84d8277c38069f3ce4e8e95ce84d4a6ffac6dc53710" From 10a804c4ead451718a02ed4040183f9973dc9087 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 13 Feb 2023 05:20:35 +0000 Subject: [PATCH 4/4] update manifests --- assets/release/release-aarch64.json | 4 ++-- assets/release/release-x86_64.json | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index fbb5397df7..e325993376 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.12.0-0.nightly-arm64-2023-02-07-004007" + "base": "4.12.0-0.nightly-arm64-2023-02-11-153144" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:deceba7099a0aeb7c82df21f74631f28ad2790c27c668849e7f5c8782b9ffa8f", @@ -13,7 +13,7 @@ "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:92834e0c216abdd62b051807d054abca1b7bc2d0b45f390cda2e14f68e868d2a", "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05148205cb9414b72a7cd83965447b6e5eb5c65492268d247291db8e77afe783", "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc825fc6123d66feb35da08022fe757a70ae05ec9659d13a128f6fae9a1988e2", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f71b319514bd550d1e854812ffa90403f8bd41eb1c412f61b696f292c8905625", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:de2a2aea96fe806095f751b51434775aef10863d21aa09ea9d3a5066240e18c4", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35e7217a646b1bbda17f3ae78ca604c37e7e3f2a8f3ab27ba4938b6a1d28b09c", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d875990af5102e92773c737d955e23bb8f563df05b3652c53d0ebe2cbad809f8" } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 129426815b..35fd6636af 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,20 +1,20 @@ { "release": { - "base": "4.12.0-0.nightly-2023-02-04-034821" + "base": "4.12.0-0.nightly-2023-02-11-110819" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f0cdc00b1b1a3c17411e50653253b9f6bb5329ea4fb82ad983790a6dbf2d9ad", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dfdf833d03dac36b747951107a25ab6424eb387bb140f344d4be8d8c7f4e895f", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:961a74e949cd15f972ffc6071e6e8c13c5160a687c603e98bd4f5f51af7829d4", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c28f27a3a10df13e5e8c074e8734683a6603ebaccd9d67e2095070fb6859b1d6", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9feb297a0007232cd124c9d0c94360b6ad35b81350b2b55469efc14fda48c72", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e8ad4781031b2bada8fe04aba3ba732530afa9b048c6e874934bc4bfefac8be", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6168c15ffe4fceeab0290f5f9e671c2962f3ccb1e731325b86578936dd15d49f", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:828be510029fdb379732cb7798a70d5433cb4921f3a99d73342c2d452d3b40c3", "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:12be6984e3a56cbc5b2a5272a872a40b242cce8a0f167993107c6de6bf776c53", - "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f18e0cf76a2ac840c9f66f89f1b47aced70650021e7931199659aef9cbca31e0", - "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6bd9d4dc813a01257767fb3b16395e8aee044feec410ed8e93ee1e82daf5a744", - "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:836d284f0c24a1d400cebc0f25e8172c28e7476879bfffe1071fb9ceb169c9ce", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cae1293448b0340d15b44c1ec93773929844349631255fa6609bf9a7ca8aec7d", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:847027714e33fd897a4212811c881ec8c736e068c9a81b968346c3e5c90b3c8b", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14794ac4b4b5e1bb2728d253b939578a03730cf26ba5cf795c8e2d26b9737dd6" + "csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a2d0451979d785a004227a5a66bae3b00467fe6734e6270bd67697f79920f88", + "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d792755d7e9bda9d95525984f8823f5fde8304902e278ac3729fcd94c585045c", + "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:211d1573308c92367f9e7e0e6ffb06257748dc81666b0629e8c210a172f13629", + "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:21bbb5586c93ddc2b847c2a4971c6e0264ab6ea641b4d4079c863ce4f87b3b3d", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50cf5b622b053d39b45d23566aa8970fe0dc60d78e1282bfe019cacc3237e54b", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be64c744b92d1b1df463d84d8277c38069f3ce4e8e95ce84d4a6ffac6dc53710", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad2114b3e9d4271c01728276e5ab49733e24f1603bd3927fc7a439eaa98f8753" } }