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

…-2023-03-27-094538_arm64-2023-03-27-185120 rebase-4.12.0-0.nightly_amd64-2023-03-27-094538_arm64-2023-03-27-185120
openshift · Mar 28, 2023 · 37631cd · 37631cd
2 parents bfcf5af + 9539b5a
commit 37631cd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git 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-03-25-054709"
+    "base": "4.12.0-0.nightly-arm64-2023-03-27-185120"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42e9ef6ff85bfe78381297c80f37db06b84e181ab91a016c26e9e71b2b9f1ceb",
@@ -13,7 +13,7 @@
     "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",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8777c2796c159bd7fb5145d131db266915af625425c4b7987de3e44dfcc168c",
     "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"
   }

diff --git 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-03-25-132813"
+    "base": "4.12.0-0.nightly-2023-03-27-094538"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47c928cdb55f80cb2c2556e798e3b67247bc2da631c82df7c04ed2bd1715ec25",

diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt
@@ -1,10 +1,2 @@
-# 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
+# ovn-kubernetes image-arm64 bcf6c596aa35342f5fa89cc4b4c516c43a63562d to 411e730257507b239fcefb37406ef5ce7055b223
+aceef010daf0697fe81dba91a39ed0fdb6563dea 2023-03-17T17:41:40+01:00 Check the "Serving" field for endpoints
diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt
@@ -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 bcf6c596aa35342f5fa89cc4b4c516c43a63562d
+https://github.com/openshift/ovn-kubernetes image-arm64 411e730257507b239fcefb37406ef5ce7055b223
 https://github.com/openshift/kubernetes image-arm64 eab9cc98fe4c002916621ace6cdd623afa519203
 https://github.com/openshift/service-ca-operator image-arm64 299b7097a49385fdd4f86eccedc07f3a192e2504
diff --git 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-03-25-132813" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-03-25-054709"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-03-27-094538" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-03-27-185120"