Merge pull request #1569 from openshift/rebase-4.12.0-0.nightly_amd64…

…-2023-03-25-132813_arm64-2023-03-25-054709

rebase-4.12.0-0.nightly_amd64-2023-03-25-132813_arm64-2023-03-25-054709

assets/release/release-aarch64.json

@@ -1,20 +1,20 @@
 {
   "release": {
-    "base": "4.12.0-0.nightly-arm64-2023-03-22-233451"
+    "base": "4.12.0-0.nightly-arm64-2023-03-25-054709"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f29bf239c71887b07f481b1482444180827c2a85c9ccbe49049cc89388ed71a3",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b37acf3e20cec32eef941035b28e862cb408a684efef8a861bbaf317edc11753",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3faec5d72b2ff7589e2fc664124f3374265fdf73d01c22dcd4bce2aa60d0366",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb8bd984c493b98238ec3e734f38a246ddd5d444cf889cff56cf628c736eefc5",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42e9ef6ff85bfe78381297c80f37db06b84e181ab91a016c26e9e71b2b9f1ceb",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d7210d08fae88a30dc875795c64d74905303921d6aa7a4bcbc3e07e24d8a86b",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9e54c270238ab882770e844bddbdea4c9fe2a9736b5ceb74a127bb51a9886c6d",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e20ea166402e92188a9375e1f5d54f156adcb1ad6137e5e0710d915193dee1d1",
     "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:3148e1f10a619c1031ff95d1cf238c6e94520072165ac0a6293077991db9a58a",
-    "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3fd455946b2d560d3b94e8f67da29ef9cc68a44dda18a656383402654b86aff7",
-    "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:606d01cb729ec2beecb44f01afad79ba02316071cf72977212b992b0f9b05c47",
-    "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a0cbda39b6b749ceff0d50250f4392510e0faa6ea37fafc05710f17ab15177b7",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2e25c075cce5c677d15c7510fa6db6d301a1e05a3b1c1a682612a543c6a7a454",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ea2ee51af63638d0ab30712e80e19613ae59f001339ec491d9acf6df381fe72",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cce29e1ed642420af789112d8a690a03c22df515e16713f444bb0ca6724e338e"
+    "csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a844f32f613ff8e988dea9856a300e570547b6dd63ed1e6592fe29b580364623",
+    "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03ac38c4bba228c7ed1bdad149149c7fcd95dca1609d46f56b76c478c15090b3",
+    "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2626d91975e84ffbb125776d9c023923674ecc750815f2816781a8ede705075e",
+    "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9cfb24ec22de58306300d66a2f52cf4d5e091aae95d3e865eeedef1da23fc46e",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc744c80ef3a2308eaa4f7323a48f8eaa32603306423e1a11007b3ede2740ff6",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e78aa01bf43544d81ac0293c92227abb7987ab35efee14349dbad78118d60eea",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56c3f7f86a8ef17e9f54441e15909fd9aa652bdacbf90f9308947f7f3af90e69"
   }
 }

assets/release/release-x86_64.json

@@ -1,20 +1,20 @@
 {
   "release": {
-    "base": "4.12.0-0.nightly-2023-03-22-232458"
+    "base": "4.12.0-0.nightly-2023-03-25-132813"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1a45573281e6750075b942b58f14c977a2420fc8b85cafe29e75ed46b969228f",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd5d25974e32c1b9f79be13d1034e4f21916f46b9d7eaf7b7d20ea2a75bfbd23",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01f84a78de43f2e932738b2924e0af49728f8ac362521179542952f98d62ea12",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b30aa7fc1920751620828d3c9aa38cc5f65c107b0f99de6d8f0565ad51ce4d58",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47c928cdb55f80cb2c2556e798e3b67247bc2da631c82df7c04ed2bd1715ec25",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:675d4d6225f3427946e5feeb7636dbde3fbb6c4bc2e88172bc3ae5c630cbd511",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:455f14c36eb6b5d51c515d844053357a53839262c75023a32a2280be97301fe4",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffbccd590dcfe4400aa218659618a453e237951662ffb9ccab96d56156a9b31f",
     "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:38f0adf74a602371bddf928484dee323b834e580e4dab3087bb6d7b85718ea05",
-    "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f0955ca0d477471e03d9847457cf7437c9307dc62c8b8c8ffba61e3ab6876d1",
-    "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd22ae8c0c2d989d7a71d6f25f41e740795a1092c61578ef9928f83e8bd9b94c",
-    "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c3e6bed4d30d26c963796a3b34ebabc2bd37149608f343c8ea2910c80910d53a",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df9df42cd54206a3e505112dbc09b5d8be884f4b944882c05c1556dec4230693",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ebaf01d4701f52663fd6018da01f0f6b8a524cf82244cdc00ba41000e7b2eb3",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:354615838c447363e35c9721416d4bdaec72cb3bc00e3d37ccb50dfd0017e78b"
+    "csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6ffae89d0b3b801d5e84c3326a0baeb8de491b3cd4559075c5257b2847df2b2",
+    "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d72b11a6bc4efbcad2bda5c692b1013d4922ac81b828153395aff336c57b5b0",
+    "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:543c476b5ab938c3901d716ee2b80d3297c60963f5db2dd8349626380d9a3626",
+    "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf51c44c3e74e41905bf999a506270f12c1223941195d21f8accad8039e0ede9",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1ba43d0c528728265d1ff05393186a4a298e4757e4053d0557e209e4dd34142c",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a8000d1184ad703b24f91fa0e1623e17ce14917e711bdc2b8c172aad3bba7c4",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b25d9d6cf2f69ef64952d4fb550a0d03641c23ba5375754789a92a72ca1d2bdd"
   }
 }

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:8ebaf01d4701f52663fd6018da01f0f6b8a524cf82244cdc00ba41000e7b2eb3"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a8000d1184ad703b24f91fa0e1623e17ce14917e711bdc2b8c172aad3bba7c4"

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:2ea2ee51af63638d0ab30712e80e19613ae59f001339ec491d9acf6df381fe72"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e78aa01bf43544d81ac0293c92227abb7987ab35efee14349dbad78118d60eea"

scripts/auto-rebase/changelog.txt

@@ -1,20 +1,10 @@
-# cluster-network-operator embedded-component 6f5e144f260333ad0f70a88a55eab4fc81ecd7a2 to 41a8c00b633446c2ee05fc19b924240de2d8b18f
-dcb9c4fd8f4f5d6e05f286154c74edf506db9baf 2023-03-15T10:23:47+00:00 HyperShift: Set priority class for CNCC
-bd1a5dfce88be9eae38e990a19807eb84d685181 2023-03-15T10:23:47+00:00 HyperShift: Adapt affinity and tolerations
-2693dff4ed419454ac3ee166ef3f7eda434fc3b1 2023-03-15T10:23:47+00:00 HyperShift: Co-locate CNCC and multus admission controller with other hcp pods
-f0b1a5c9f0b5671e9f3036837ad42d5bcb1f3fde 2023-03-09T15:33:56+01:00 Set healthz-bind-address to 0.0.0.0:10256 for ovnk
-f5829e9512e9fc889bbfc2cf7a0c695dc5cad803 2023-03-09T15:33:27+01:00 Pass POD_NAME to ovnkube node for node healthz server checks
-e68f4544baf91dcd51d2040ed0ed77de31784b36 2023-02-28T09:07:48+00:00 Bug 2104997: add default noProxy config for Azure
-# etcd embedded-component 978cfefd2f21c4ec1ac84ed95130cbff510fbe1b to 1f438849661e691748dc3b24fc373444439415b6
-d9ba334e195930833bb7a70c99993491ca78c16a 2022-11-22T10:53:27+00:00 Updating ose-etcd images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/82677d9ecf22d7b5589bbcd83e507a10fb6a89c6/images/ose-etcd.yml
-# machine-config-operator embedded-component 731341b89e72d53abb349aff98d09e281e471066 to f6c21976e39cf6cb9e2ca71141478d5e612fb53f
-1d35900a3b929c2e8a2046b31d3a39e4f2aa9176 2023-03-17T18:45:41+00:00 daemon: Drop duplicate `--authfile` used in `run`
-7c35afd89d49230379c0ecceec67253d1bdd533b 2023-03-15T22:35:59+00:00 Remove hard requirement for the afterburn from early-running aws-related services
-# ovn-kubernetes image-amd64 1ec7d41fac8e6489013847a3b45bee4658b95d1a to b99f9300d6563ab4637941dd98e16c72297299e7
-cc79d2606a14af32f36110e15eb316278f157355 2023-03-17T12:12:26+01:00 Move checkForStaleOVSInterfaces and related code to node.go
-5ee65cb283570e5f8bedd549132369ea03782259 2023-03-13T12:53:13-04:00 Fully remove dependency on default gateway for services
-f2b6a8d66ad3d53d1676276aeca899ae6fe8d34b 2023-03-09T13:14:54+01:00 node: add node healthz server for cloud load balancers
-1a2774d35517757f73f7a2d974266f1bd09b203f 2023-03-09T12:57:05+01:00 node: split openflowManager and service health check code
-048ece68d496f011c31bc80c25e7386ed7db7398 2023-02-23T23:25:27+00:00 [release-4.12] OCPBUGS-7732: Fix leak in service controller cache
-# ovn-kubernetes image-arm64 34a028a1e17471a797662701c405e361dfcf7952 to b99f9300d6563ab4637941dd98e16c72297299e7
-048ece68d496f011c31bc80c25e7386ed7db7398 2023-02-23T23:25:27+00:00 [release-4.12] OCPBUGS-7732: Fix leak in service controller cache
+# etcd embedded-component 1f438849661e691748dc3b24fc373444439415b6 to c1d76ffd4b4cf0a0d2a6056a505fbef0b187c027
+a96bf4cd5c6aa314b443063e7c900448d90b3e80 2023-03-23T08:14:34+00:00 Update owners
+# oc image-amd64 846602e50eb29ecdc7441ebed2fc846048959eaa to 31aa3e89a926f81aa0af30320ffcb71acadf3015
+0be76451bf9b46771daefb2a953d5d61d3917d30 2023-03-23T10:45:00+00:00 OCPBUGS-10622: bump repo sclorg/s2i-ruby-container location for newapp
+# ovn-kubernetes image-amd64 b99f9300d6563ab4637941dd98e16c72297299e7 to bcf6c596aa35342f5fa89cc4b4c516c43a63562d
+b72f15e83f7760ba261b2977730337bebfb6bd4a 2023-01-19T11:00:12+01:00 Update egress node assignability on every egress node update
+# oc image-arm64 846602e50eb29ecdc7441ebed2fc846048959eaa to 31aa3e89a926f81aa0af30320ffcb71acadf3015
+0be76451bf9b46771daefb2a953d5d61d3917d30 2023-03-23T10:45:00+00:00 OCPBUGS-10622: bump repo sclorg/s2i-ruby-container location for newapp
+# ovn-kubernetes image-arm64 b99f9300d6563ab4637941dd98e16c72297299e7 to bcf6c596aa35342f5fa89cc4b4c516c43a63562d
+b72f15e83f7760ba261b2977730337bebfb6bd4a 2023-01-19T11:00:12+01:00 Update egress node assignability on every egress node update

scripts/auto-rebase/commits.txt

@@ -6,31 +6,31 @@ https://github.com/openshift/cluster-kube-scheduler-operator embedded-component
 https://github.com/openshift/cluster-network-operator embedded-component 41a8c00b633446c2ee05fc19b924240de2d8b18f
 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 1f438849661e691748dc3b24fc373444439415b6
+https://github.com/openshift/etcd embedded-component c1d76ffd4b4cf0a0d2a6056a505fbef0b187c027
 https://github.com/openshift/kubernetes embedded-component eab9cc98fe4c002916621ace6cdd623afa519203
 https://github.com/openshift/machine-config-operator embedded-component f6c21976e39cf6cb9e2ca71141478d5e612fb53f
 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
-https://github.com/openshift/oc image-amd64 846602e50eb29ecdc7441ebed2fc846048959eaa
+https://github.com/openshift/oc image-amd64 31aa3e89a926f81aa0af30320ffcb71acadf3015
 https://github.com/openshift/coredns image-amd64 9aaa7e0a86b69bafb9f544a0e5cb1873535a8f6b
 https://github.com/openshift/csi-external-provisioner image-amd64 140851f6c0e70cf917b3361808b31628c68ea8a5
 https://github.com/openshift/csi-external-resizer image-amd64 239d751f51743214417dd5058645c2c1d390d1b5
 https://github.com/openshift/csi-livenessprobe image-amd64 720e1d6e3e828dec9908091da9f5d80a31d75585
 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 b99f9300d6563ab4637941dd98e16c72297299e7
+https://github.com/openshift/ovn-kubernetes image-amd64 bcf6c596aa35342f5fa89cc4b4c516c43a63562d
 https://github.com/openshift/kubernetes image-amd64 eab9cc98fe4c002916621ace6cdd623afa519203
 https://github.com/openshift/service-ca-operator image-amd64 299b7097a49385fdd4f86eccedc07f3a192e2504
-https://github.com/openshift/oc image-arm64 846602e50eb29ecdc7441ebed2fc846048959eaa
+https://github.com/openshift/oc image-arm64 31aa3e89a926f81aa0af30320ffcb71acadf3015
 https://github.com/openshift/coredns image-arm64 9aaa7e0a86b69bafb9f544a0e5cb1873535a8f6b
 https://github.com/openshift/csi-external-provisioner image-arm64 140851f6c0e70cf917b3361808b31628c68ea8a5
 https://github.com/openshift/csi-external-resizer image-arm64 239d751f51743214417dd5058645c2c1d390d1b5
 https://github.com/openshift/csi-livenessprobe image-arm64 720e1d6e3e828dec9908091da9f5d80a31d75585
 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 b99f9300d6563ab4637941dd98e16c72297299e7
+https://github.com/openshift/ovn-kubernetes image-arm64 bcf6c596aa35342f5fa89cc4b4c516c43a63562d
 https://github.com/openshift/kubernetes image-arm64 eab9cc98fe4c002916621ace6cdd623afa519203
 https://github.com/openshift/service-ca-operator image-arm64 299b7097a49385fdd4f86eccedc07f3a192e2504

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-03-22-232458" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-03-22-233451"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-03-25-132813" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-03-25-054709"