rebase-4.12.0-0.nightly_amd64-2023-06-29-055454_arm64-2023-06-29-103348

assets/release/release-aarch64.json

@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.12.0-0.nightly-arm64-2023-06-29-005130"
+    "base": "4.12.0-0.nightly-arm64-2023-06-29-103348"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b414a28b4d3272f9ff2e399af83c62cd157a189ab1345d91d5f005aa1885d6b1",

assets/release/release-x86_64.json

@@ -1,20 +1,20 @@
 {
   "release": {
-    "base": "4.12.0-0.nightly-2023-06-26-100619"
+    "base": "4.12.0-0.nightly-2023-06-29-055454"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f8c3d97695331a52b44f669c63509a75f10308edcb4bc9f1de94f30b47e20491",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:189f8e97b6ceef052b34ce707e7317759c37a6d36d01cab58416756bdd4ac34c",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d562e9349792159ac0d7f8e6b6130b6e79ca1703a9e37a56d5533a40da118c5",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8e4431ed3d90bafa8b99d473796efe3094d5938f0eb0577b67ab3ff0c907434",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:840f6c28b4c7d71ecff23f0c31d3e833aee39a7eb45a760762f32072bcec86be",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95dd3672584bef74a77a559cb92f466410fad0d9f3bf6d6fac2769e46c735292",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1360e96dd3a7bd06132df6618ef1af32c7282e0ebf1e63f0ef84fab29badcea",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:029a446bb8fbaa69770488a70d19f5b1215fb1a4abdba3a5072efa5d933e52ef",
     "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:28c241d9f739491b35c7e19d384823f09e2e3dad97d6905405a337d292fd23ca",
-    "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f97b92798f55051fdb15b8e9be32c9a41c9ea0636351a2d94c4454306f25a082",
-    "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0eaf3edec4dea89c526b3047b3833f9f51d2f97893d6105efc86be4a8ebb7019",
-    "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ff4120a5d138b9e21e7b7b80a1d2d6403c0c2c16dfc11a96a2ed95a23179a94",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6cb22cc098aa26b1004ace451b36ab857ca4e5821223e256cd75d94ab7f8df60",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:740e79ba30312c68fcb4eb45a371c5129f77e60b1711f0f606c0b1358af2570d",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:042732823a762e496298d7700b94aa3ee583edcdc144ca1e78b8f83b60f5c6db"
+    "csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c35043de6bfe9c71924332440d2fbfc953fb9705a295f804add8ee8d6a5fec7b",
+    "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6543fea59eb331dbf4d9720c95eafccfb7288826d45e3240a2a2360b96760df4",
+    "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe27cfaaea97f006b187a9b76d1a685c81fc03d42a2c55f18344a6d3fb15460a",
+    "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9830527ac7d918cb69b3f4e693174d7281a52960a14261f09396ba910747c487",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f089a420a01c77bdcd2cd8065496e6922eee9852c793d9e521aed1ff21a677c1",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6109f2a453f037b0a468e0694d9b5f44d3f69a931f0804abc1cf318e62d48148",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bfbcbd8aab1b2d2e43efd85df3ea537098f36754b75b2ce5ca92f358e19c4222"
   }
 }

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:740e79ba30312c68fcb4eb45a371c5129f77e60b1711f0f606c0b1358af2570d"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6109f2a453f037b0a468e0694d9b5f44d3f69a931f0804abc1cf318e62d48148"

scripts/auto-rebase/changelog.txt

@@ -1,2 +1,2 @@
-# ovn-kubernetes image-arm64 17f9ed57beb21648ed53e5c360a6ad35f3791091 to 3aa743ca58669d91cc7da29aa5157648a4241361
+# ovn-kubernetes image-amd64 17f9ed57beb21648ed53e5c360a6ad35f3791091 to 3aa743ca58669d91cc7da29aa5157648a4241361
 741a619f85104ad0b404996afc596e5652728cbb 2023-06-27T09:02:09+02:00 Add default deny acl externalID to avoid duplicate acls for namespaces with long names. every namespace has 4 default deny acls: ingress/egress and deny/allow. Direction was in the ExternalIDs before, but action was a suffix in acl name, that gets truncated for long namespace names, therefore deny and allow acls for the same direction would have the same name and ExternalIDs. New ExternalID should fix this case.

scripts/auto-rebase/commits.txt

@@ -20,7 +20,7 @@ https://github.com/openshift/csi-livenessprobe image-amd64 9cb056421c5a2e37435db
 https://github.com/openshift/csi-node-driver-registrar image-amd64 805d5ac247137b02e6081e3eb7aa1fb9f4c7b4b2
 https://github.com/openshift/router image-amd64 3a1f43ca2b7e1549c6d108b6311cda59fcca28d6
 https://github.com/openshift/kube-rbac-proxy image-amd64 94f3fde785a22afdc77768f5c346c7d3195274d2
-https://github.com/openshift/ovn-kubernetes image-amd64 17f9ed57beb21648ed53e5c360a6ad35f3791091
+https://github.com/openshift/ovn-kubernetes image-amd64 3aa743ca58669d91cc7da29aa5157648a4241361
 https://github.com/openshift/kubernetes image-amd64 c43ddea5eec2220b3e691afe6a2f1529e0a454cd
 https://github.com/openshift/service-ca-operator image-amd64 299b7097a49385fdd4f86eccedc07f3a192e2504
 https://github.com/openshift/oc image-arm64 ea7c11aac7fa39d9eb733b62251ee1bc4a242c99

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-06-26-100619" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-06-29-005130"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-06-29-055454" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-06-29-103348"