From 9dae5ba3ab6da620a880f9946f9e01c9a5db844c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 5 Jul 2023 05:13:20 +0000 Subject: [PATCH 1/4] 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 e42b2a9f7a..4c70652bc9 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-29-055454" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-06-29-103348" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-07-03-233301" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-07-04-173404" From f3b0719c95b3b9366b59ce05d64b0987cdefb190 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 5 Jul 2023 05:13:20 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 4 ++-- scripts/auto-rebase/commits.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 99b0e5b70c..5fce7eddb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,2 +1,2 @@ -# 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. +# kubernetes image-arm64 c43ddea5eec2220b3e691afe6a2f1529e0a454cd to 1485cc947720a841d83204046599f02432d32707 +6958d8f87fc5ab0658a8cc5a40e42a042870cc2e 2023-07-03T16:53:50+02:00 UPSTREAM: : bump apiserver-library-go diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 54b891207c..3a4e7059ea 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -32,5 +32,5 @@ https://github.com/openshift/csi-node-driver-registrar image-arm64 805d5ac247137 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 3aa743ca58669d91cc7da29aa5157648a4241361 -https://github.com/openshift/kubernetes image-arm64 c43ddea5eec2220b3e691afe6a2f1529e0a454cd +https://github.com/openshift/kubernetes image-arm64 1485cc947720a841d83204046599f02432d32707 https://github.com/openshift/service-ca-operator image-arm64 299b7097a49385fdd4f86eccedc07f3a192e2504 From 65bb002288abdb77a55a270be9bc8d9709b29dc9 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 5 Jul 2023 05:15:31 +0000 Subject: [PATCH 3/4] update component images --- packaging/crio.conf.d/microshift_arm64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crio.conf.d/microshift_arm64.conf b/packaging/crio.conf.d/microshift_arm64.conf index b3199edcad..8179060244 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:e997d565ede5a590353e82c0e3bc229be0c215f85260ec7e96cb68cdc6edc989" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2937008d890cbb6a0cf5f577fab81958d229be556ddcbe7470ce2f2d454a0e31" From ff6d15864f744f1c5ec708adb1ccd91c50799de3 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 5 Jul 2023 05:15:31 +0000 Subject: [PATCH 4/4] update manifests --- assets/release/release-aarch64.json | 4 ++-- assets/release/release-x86_64.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 0909a9febb..476644c445 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-29-103348" + "base": "4.12.0-0.nightly-arm64-2023-07-04-173404" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b414a28b4d3272f9ff2e399af83c62cd157a189ab1345d91d5f005aa1885d6b1", @@ -14,7 +14,7 @@ "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:3883619d09ddb5868727a4fb4131e580a62b20103de694775abd63fd537f3cf0", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e997d565ede5a590353e82c0e3bc229be0c215f85260ec7e96cb68cdc6edc989", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2937008d890cbb6a0cf5f577fab81958d229be556ddcbe7470ce2f2d454a0e31", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db078b01e116e73ae91a7fdf746986e48dc595f4e8d145d3e438b2a5136587d7" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 62294f9649..a27d3d35f3 100644 --- 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-06-29-055454" + "base": "4.12.0-0.nightly-2023-07-03-233301" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:840f6c28b4c7d71ecff23f0c31d3e833aee39a7eb45a760762f32072bcec86be",