From 20e7682fd0de991170db9450dd9aa0398f83793c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 9 Feb 2023 05:24:47 +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 af15774d55..9de7decdf0 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-02-04-034821" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-02-06-104953" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-02-04-034821" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-02-07-004007" From 0b8e82eba41bb2bbe84d91bb9e7460ebb108d527 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 9 Feb 2023 05:24:48 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 13 +++++-------- scripts/auto-rebase/commits.txt | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 3b81e6e75e..55734b61a1 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,8 +1,5 @@ -# cluster-network-operator embedded-component ea6bb1159ffdb9fb68095f9f187ffa56bd1e745a to 68d109ac3b8605525c2aabc29789415bc302c9c7 -6c6c7d46b5a0699fd91e3b88cd50c73453066475 2022-11-29T12:47:22+00:00 HyperShift: Co-locate OVN-Kubernetes master pods with other hosted control plane components -# ovn-kubernetes image-amd64 a2c90a409b4757b03c35d1e1f51da86135187e79 to e5fff733e0936d3ce30633f41d402da82e173186 -bb24879a99459bf689884292ac95ea2e22fe6bcd 2023-01-13T15:01:12-05:00 ovnkube-node: Existing management port check -# ovn-kubernetes image-arm64 a2c90a409b4757b03c35d1e1f51da86135187e79 to abcf2f9980650a56dceac6466960197bf71b78c4 -011ae64c8ef4331fd83c8cbcdf226e53ac770085 2023-01-24T11:01:24+01:00 ovnkube-trace: run ovn-sbctl and ovn-trace with --no-leader-only -bb24879a99459bf689884292ac95ea2e22fe6bcd 2023-01-13T15:01:12-05:00 ovnkube-node: Existing management port check -34bfbfa3fe4f24d1e88eafa3f703930a92c62faa 2023-01-12T10:38:52-05:00 Correct the deletion of noHostSubnet nodes +# ovn-kubernetes image-arm64 abcf2f9980650a56dceac6466960197bf71b78c4 to 63ad553a4e09d78d60e1034afbfb20d828b7596f +d65b4240266a54d732d885ab34c5128c62c8565c 2023-02-02T17:09:57+08:00 generate more-pkgs with sed cmd in Dockerfile.base +c1f1b9a9cf33fd42c890937d21f446b585e5a909 2023-02-02T08:47:42+08:00 Update base image of Dockerfile +d72f55630e174e446df8780ad93e9a7fba52a76c 2023-01-31T10:45:58+00:00 Fixup egress fw tcs after modification of ACL match output +8b5f7f16e88d71f899ccccec12b55d46de186e73 2023-01-31T10:45:47+00:00 Fix egress firewall cluster exclusion in dualstack diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index fddc25458f..aaf02123fd 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 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 abcf2f9980650a56dceac6466960197bf71b78c4 +https://github.com/openshift/ovn-kubernetes image-arm64 63ad553a4e09d78d60e1034afbfb20d828b7596f https://github.com/openshift/kubernetes image-arm64 a34b9e9499e6c3a94e2326652bd8236a5378c0b2 https://github.com/openshift/service-ca-operator image-arm64 299b7097a49385fdd4f86eccedc07f3a192e2504 From f17b387933f77081531ea3f4089152bb337cc052 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 9 Feb 2023 05:25:48 +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 63e82b5e82..8373d9d51b 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:8aa06d6af9e573a75c9467d02687ff1fa99eec04500c2298147a75f4aeed7ab2" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35e7217a646b1bbda17f3ae78ca604c37e7e3f2a8f3ab27ba4938b6a1d28b09c" From e24047a393284df86a3c9234ae01e9e3e1293d97 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 9 Feb 2023 05:25:49 +0000 Subject: [PATCH 4/4] update manifests --- assets/release/release-aarch64.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 76b7155097..fbb5397df7 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,20 +1,20 @@ { "release": { - "base": "4.12.0-0.nightly-arm64-2023-02-06-104953" + "base": "4.12.0-0.nightly-arm64-2023-02-07-004007" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a40acddfae934433bc4fcee386cb83983ab4c6d32923f59517245f9141b0da17", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:782438942652d17d04836acd9230e81b1fcd3aaac3813b5db82dd7f93ddf0473", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:982f462f649959a7e107ed52e6263ca27671b5093da8693a4c5e74c1fe5602b2", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:89a59eea6150962bf5d439976ef6c5e7fd3194810a747e2d0f87519c473fbf61", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:deceba7099a0aeb7c82df21f74631f28ad2790c27c668849e7f5c8782b9ffa8f", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc4f910e887594c4a3b14fcfe76a17978e013112419d7fb3e060b081ec0aa31e", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b7736b8ecc8f5eba6931a0114bf9e830c00474b1c517d2336862bc8668a5611", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:74084d78b2f16bdf566d0ca092a5a75d914027f58aa6b78f09ecb688e9d8b404", "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:82f18dec7671556868af20fb51244a1c30d8f72926d2d9a9adef93a59231e18b", - "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ebafc2665919d44f2203d476e806382ea09acbaa248407a43a6f2813cd56da71", - "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c48ff6738f67ddc4537a9eb6a9087753244fc58c88e23abca4a0018b8121cf6a", - "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1ebae2cefa751cc0e3ea505d25fe0a83a09889d31a0c107404a1ec3795ba7df", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53c746b833e81a513ce46c0616c78f33efa9e8f8e3d9eaa99f66597c401de39f", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8aa06d6af9e573a75c9467d02687ff1fa99eec04500c2298147a75f4aeed7ab2", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2427ed3e368da7b1122c9aa0bf732cb3955c172158b08a297a982fecb67196bd" + "csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc302e21c073cd7b18110e69d449b06bc71198e5f8d6ff8357759202e215c45e", + "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:92834e0c216abdd62b051807d054abca1b7bc2d0b45f390cda2e14f68e868d2a", + "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05148205cb9414b72a7cd83965447b6e5eb5c65492268d247291db8e77afe783", + "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc825fc6123d66feb35da08022fe757a70ae05ec9659d13a128f6fae9a1988e2", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f71b319514bd550d1e854812ffa90403f8bd41eb1c412f61b696f292c8905625", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35e7217a646b1bbda17f3ae78ca604c37e7e3f2a8f3ab27ba4938b6a1d28b09c", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d875990af5102e92773c737d955e23bb8f563df05b3652c53d0ebe2cbad809f8" } }