diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index bdf1606caf..999eb96ea7 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-06-26-235841" + "base": "4.12.0-0.nightly-arm64-2023-06-29-005130" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b414a28b4d3272f9ff2e399af83c62cd157a189ab1345d91d5f005aa1885d6b1", @@ -13,7 +13,7 @@ "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1bd1a683ac957afdd40120bc06983bf75eddbc1c9ac4d16bde1456c800ed368a", "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d077340d80622cfecf98935f3536a96fbd22ad94a6640dcb5f16408b88062b64", "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf8d21ff9a3cc53efced7a196b1c8be2637746e00a91f4ff2917ab4499b346a2", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:46bd72b34ca0664095e5f1b951fb56bafae45588affe5b5f2efd7a09986774d2", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3883619d09ddb5868727a4fb4131e580a62b20103de694775abd63fd537f3cf0", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e997d565ede5a590353e82c0e3bc229be0c215f85260ec7e96cb68cdc6edc989", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db078b01e116e73ae91a7fdf746986e48dc595f4e8d145d3e438b2a5136587d7" } diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..236865973c 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,2 @@ +# ovn-kubernetes image-arm64 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. diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 63aa80611c..293a454a79 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -31,6 +31,6 @@ https://github.com/openshift/csi-livenessprobe image-arm64 9cb056421c5a2e37435db https://github.com/openshift/csi-node-driver-registrar image-arm64 805d5ac247137b02e6081e3eb7aa1fb9f4c7b4b2 https://github.com/openshift/router image-arm64 3a1f43ca2b7e1549c6d108b6311cda59fcca28d6 https://github.com/openshift/kube-rbac-proxy image-arm64 94f3fde785a22afdc77768f5c346c7d3195274d2 -https://github.com/openshift/ovn-kubernetes image-arm64 17f9ed57beb21648ed53e5c360a6ad35f3791091 +https://github.com/openshift/ovn-kubernetes image-arm64 3aa743ca58669d91cc7da29aa5157648a4241361 https://github.com/openshift/kubernetes image-arm64 c43ddea5eec2220b3e691afe6a2f1529e0a454cd 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 index 9f68d1cbab..d1187b8268 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-06-26-100619" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-06-26-235841" +./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"