From 7d422a804c7c989b4a7101629c388336254249e0 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 11 May 2023 05:11:52 +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 83dfb095e0..cb23c68dd5 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-04-21-075837" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-04-22-075131" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-05-10-185003" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-05-10-234235" From cf9b6bda3f7405f8d37499db5c6278e90deb552c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 11 May 2023 05:11:53 +0000 Subject: [PATCH 2/5] update changelog --- scripts/auto-rebase/changelog.txt | 20 ++++++++++++++++---- scripts/auto-rebase/commits.txt | 6 +++--- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 35af24b54c..b2d7850745 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,4 +1,16 @@ -# kubernetes embedded-component 27e744f55d2e99eb8265c837e2571e47559079f6 to 37a9a084bcb483a38e8f88349fa6a21c1b6be8a3 -fcc276e6484511855b2f9407913625d4b067b77a 2023-02-16T12:47:20+00:00 UPSTREAM: : add default sysctls for kubelet in rpm -# kubernetes image-amd64 27e744f55d2e99eb8265c837e2571e47559079f6 to 37a9a084bcb483a38e8f88349fa6a21c1b6be8a3 -fcc276e6484511855b2f9407913625d4b067b77a 2023-02-16T12:47:20+00:00 UPSTREAM: : add default sysctls for kubelet in rpm +# cluster-network-operator embedded-component 4ff7caec8e5bbb761e00f723bdd3fff26f04bc54 to 227d9f97dddf86d614afac83be4d7c9258b542bc +886c4d2e5d950644ee59e17d5658ee3a74b4dc25 2023-04-07T23:34:39+00:00 With Hypershift run as user passed from hypershift +259925bb0e5946a7352c0166630fffca34f7d9bf 2022-12-22T11:58:35+01:00 Fix CNO crashing when Kuryr without MTU is set +bbdcb0a831427037d88fe5b03fb763342648bd0a 2022-12-15T11:43:34+00:00 Kuryr: If set use MTU from Config for svc net +# ovn-kubernetes image-amd64 774134525ed229a934445ed209090a71d952ed7f to 401c3ae3508d24dccb5fce60cf903d1718f90832 +916443e21442e51435fb467138015daf70952932 2023-04-26T18:46:58+02:00 Delete equivalent ACLs when searching by predicate. +c16fe5ac36515c76d656d8e37ca45ab30923da13 2023-04-21T19:10:12+02:00 Add an option to enable scale metrics in kind +371e5589369c35a0121f1cee7edfb2d46b45e3af 2023-04-21T19:01:31+02:00 Add MetricMasterSyncDuration metric to track how much it takes for ovn-k master to start watching every resource. Add scale metrics for network policies, rename existing enable-eip-scale-metrics flag to more general enable-scale-metrics, and use it for network policy metric too. +24229b2684a0b700edcc3660b463046e466d0974 2023-02-14T09:55:42+02:00 Egress Services: Fix nodeSelector parsing +e237e479f64783e561b0405e010418251631c4bd 2023-02-14T09:55:32+02:00 Egress Service: split the contexts of the tests +# ovn-kubernetes image-arm64 774134525ed229a934445ed209090a71d952ed7f to 401c3ae3508d24dccb5fce60cf903d1718f90832 +916443e21442e51435fb467138015daf70952932 2023-04-26T18:46:58+02:00 Delete equivalent ACLs when searching by predicate. +c16fe5ac36515c76d656d8e37ca45ab30923da13 2023-04-21T19:10:12+02:00 Add an option to enable scale metrics in kind +371e5589369c35a0121f1cee7edfb2d46b45e3af 2023-04-21T19:01:31+02:00 Add MetricMasterSyncDuration metric to track how much it takes for ovn-k master to start watching every resource. Add scale metrics for network policies, rename existing enable-eip-scale-metrics flag to more general enable-scale-metrics, and use it for network policy metric too. +24229b2684a0b700edcc3660b463046e466d0974 2023-02-14T09:55:42+02:00 Egress Services: Fix nodeSelector parsing +e237e479f64783e561b0405e010418251631c4bd 2023-02-14T09:55:32+02:00 Egress Service: split the contexts of the tests diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 68a1459550..bc56ac28fa 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 6f3e22f https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 2076f3d0e4fea6fca54028ec7831407173ea81f5 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 1c2157df6e9031bf6abb9250d2bec901608fe5b4 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 845ae423e831b1cacf0bcae5e6528f1d21b5ddf2 -https://github.com/openshift/cluster-network-operator embedded-component 4ff7caec8e5bbb761e00f723bdd3fff26f04bc54 +https://github.com/openshift/cluster-network-operator embedded-component 227d9f97dddf86d614afac83be4d7c9258b542bc https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component d1915d130481541b8bacb5b98eddbc1541809d0a https://github.com/openshift/cluster-policy-controller embedded-component 139ac0499ac4d744023827ceb6d16aa6b467be27 https://github.com/openshift/etcd embedded-component c1d76ffd4b4cf0a0d2a6056a505fbef0b187c027 @@ -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 94f3fde785a22afdc77768f5c346c7d3195274d2 -https://github.com/openshift/ovn-kubernetes image-amd64 774134525ed229a934445ed209090a71d952ed7f +https://github.com/openshift/ovn-kubernetes image-amd64 401c3ae3508d24dccb5fce60cf903d1718f90832 https://github.com/openshift/kubernetes image-amd64 37a9a084bcb483a38e8f88349fa6a21c1b6be8a3 https://github.com/openshift/service-ca-operator image-amd64 299b7097a49385fdd4f86eccedc07f3a192e2504 https://github.com/openshift/oc image-arm64 31aa3e89a926f81aa0af30320ffcb71acadf3015 @@ -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 94f3fde785a22afdc77768f5c346c7d3195274d2 -https://github.com/openshift/ovn-kubernetes image-arm64 774134525ed229a934445ed209090a71d952ed7f +https://github.com/openshift/ovn-kubernetes image-arm64 401c3ae3508d24dccb5fce60cf903d1718f90832 https://github.com/openshift/kubernetes image-arm64 37a9a084bcb483a38e8f88349fa6a21c1b6be8a3 https://github.com/openshift/service-ca-operator image-arm64 299b7097a49385fdd4f86eccedc07f3a192e2504 From 747e20de9ab9886e974f4de85abce237f85b7746 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 11 May 2023 05:12:44 +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 d132d177a0..7a4e204973 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:c719394a975c77546ec44634abdb59365e24d7796a428d580289d7a763919aeb" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2489b0f33a987f6b40ef23e474c384267a351e9b47c33c926356ec69d7a2c79c" diff --git a/packaging/crio.conf.d/microshift_arm64.conf b/packaging/crio.conf.d/microshift_arm64.conf index ebb7383dfe..db5083f261 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:c4f4adb2f3469f995052872c1d9c3df516559b3fb556bc97cbf06089dffddbe6" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62caed97026a5782e6887bfe59b2efce8096667a0047006fcc59411890841749" From 8bf9edff64c6def10d08d93d46a51c43577e529a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 11 May 2023 05:12:46 +0000 Subject: [PATCH 4/5] update manifests --- assets/release/release-aarch64.json | 24 ++++++++++++------------ assets/release/release-x86_64.json | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 27af72d233..63653e3bac 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-04-22-075131" + "base": "4.12.0-0.nightly-arm64-2023-05-10-234235" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b1e0a2ed8babc14c8d3acd30bf6a946c63213cf254c7df4490b704fa6cc0611", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:747c5dd7f796f9d6ae7796fe7e76d6137ebb56405b424101ccd92face1476af2", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c96b935591fc684209ddb614f1bf5321441abe00d0dcbb0f271bd412443139f5", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7cb5ad17aad0e2aad502ff241792f4d583dd54b4d23ec655af3b86bc72c52424", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c30ab6f34cb327d28dcca7fad4b1d1d9281ff1296aa4a63f957239c6e4fceeb3", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c51c63abca4fdc2908f359ab88ad9af836f2d75f833fb1570aca79b2499ec505", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:64df35c9a0b3cbcc638eeaf77f2b449feee5283cbe641f62f9aa9fa8faa6b013", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f093c8a00adb606d317aa7f4e615fa2cbb29dfc32683174c2775870226e50c6a", "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:b89c66cee36df797215076ce573f592b5ffc85728de64978ab32c31940541ba0", - "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e384f94b11af2e4d0338042c00f5568265c139c9f90fc3c10ca323f003b0f06e", - "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42ba45d77ed96b3289d6193d3e73f16da64071daa661ca114515f6feecd4531c", - "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e9866127ffe26bf048118fc481fac169a824bb28a013f80a10b4750a87c9c28", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d578167925b42cd92a6269972f7436d61c62628210aba380fe266235b5a6083", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c4f4adb2f3469f995052872c1d9c3df516559b3fb556bc97cbf06089dffddbe6", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b8a6a4f0b3fcb2864fc8c8506536fb2b6ce3ec0ae6f46027951225bf17ea3446" + "csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11b7127104153c0e70369d13e796a93570ab2c8db143f152fc72900254cea0d7", + "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42d91b64873fba1da92f6a694235c612b070d11494833a7d90fb150e6172b6e5", + "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ee678922fa589c82ce577ffabf77756dd29e6505992f539960bf7f3e0df09d1", + "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:63829b06638d884ac6338e9b7c6d570138fdce9eff0e177734ed1641387ac9c8", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e38d5254136046591e824c5a21048fc06ec1a732e4556e4f33975a747acf7851", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62caed97026a5782e6887bfe59b2efce8096667a0047006fcc59411890841749", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9c16b90b14db5c12787fba494b12bb3cb246e68bd86af46f6a48514bfd42d44" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index f579c1f2b8..c319b310f1 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-04-21-075837" + "base": "4.12.0-0.nightly-2023-05-10-185003" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09dc3e8e8b71674cbd069ac534816a6eac6ffe7fb2ea4767b28fc4261e1b1704", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78e2259387d7e14845c518a63a590808baa374d05acc8209194c8c5deb2720cb", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8227f8ec3544425568502b0f94691437823742caefe911072c43871339bd844b", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea7d6825ec2ae58204a9be548b3ec1db6e010bebf39c3310f562e93be2113024", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a62629538a5fe969f2f9e1808573d0e3d62993337826d4dee3ba4736a224398c", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e4e81d7d9a9b373350d0379e12f4398789f799f1b8809c5c669079a390ed97df", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d6a5661e4c6d244bcfac981b3fa88ac44443a563eef97ecb9290d9cb89c7319", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9cb1d3eb5b6185f135fcc85eca296e290161c5baf5a300037d10e3320df12248", "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:f23aec3180808dcc46c2e5adde9906c2007eddfdc3812c5d91b6982760647f57", - "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:465385e1fcfd1a844ba0fe840c2e2cbb509bcb751eb856886a7792fee62cb245", - "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:260b1aa6c0f1bee5a21abcdd66fa1c08973d4e470a5dd3deffbfa61e18be613d", - "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:705b8e4192643df1c042fa31c264974c41b9dfa82f204788ec5e50a208e9874f", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:154863a9d8ca268e05cb3e5513302355c0591feab8736e16466ff64166444baa", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c719394a975c77546ec44634abdb59365e24d7796a428d580289d7a763919aeb", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5177e5ecc3e09f921ad7719ea739df5111fad532dae08f7a219448f1ca1aa604" + "csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e3878b5ecd5e61178ae2a3b7822a6e4a117dcc7ed973bab3739ea5c2c53de9c0", + "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41774ce3836d291d72b75fd07cc6d033c735b544f55224b8d63e60b9814dcde3", + "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc1a668f830717d54a879405eed83a8f5590879138ec6c1c057c41d14e37202a", + "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8cba8982bb4223b864a4faf9783a32b2888bfc80817305ff808ee8efb0a28562", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:46ca9fa753771fb18b6e7438f1d3958f34d022455fad2222c1369cf00aa2c662", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2489b0f33a987f6b40ef23e474c384267a351e9b47c33c926356ec69d7a2c79c", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa202021969ad1f1565e92a52a35359a30870ffeb47edd7ff29da30d2856cbdb" } } From a6ff47e99056519e23a7e8a713620325d944a01d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 11 May 2023 05:12:47 +0000 Subject: [PATCH 5/5] update buildfiles --- Makefile.kube_git.var | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 11e23715d4..acb3fa6d6c 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=25 -KUBE_GIT_VERSION=v1.25.0 +KUBE_GIT_VERSION=v1.25.8 KUBE_GIT_COMMIT=37a9a084bcb483a38e8f88349fa6a21c1b6be8a3 KUBE_GIT_TREE_STATE=clean