From 803e336317570be6e9a7f2879b2b601bf95890b1 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 6 Apr 2023 05:06:52 +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 8f441c27e9..3908611fdf 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-04-03-132047" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-03-30-084912" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-04-04-050651" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-04-05-192947" From 1d2f13d1c1a53ce65c29a31e4a717e7d4be1f0a7 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 6 Apr 2023 05:06:52 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 35 ++++++++++++++++++++++++------- scripts/auto-rebase/commits.txt | 6 +++--- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 4fa47e4883..5a280327fb 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,7 +1,28 @@ -# cluster-network-operator embedded-component 41a8c00b633446c2ee05fc19b924240de2d8b18f to 6878a2cec16309dcd96aaf03ae0d7db8f37d3cde -4fbe0b47753fd408689b94b7ee0094f7db8da6e2 2022-12-09T11:58:33+00:00 Fix info log formatting -# machine-config-operator embedded-component 52fe26136643a946ff1dd1307012cbdef31ebf97 to e8291b07876fd93fad5ef8c09b9f47621186cb17 -963248648c0e90610fd3d88ee252d9d484c73d7a 2023-01-17T15:54:12+00:00 OCPBUGS-5872: Wrap podman commands in a while loop -# ovn-kubernetes image-amd64 78938a80db83ac5df2d450103829c319c733b23a to ffce71cb9cc045517288ed0f28a5d25c059d2438 -8ce4aa4f4594271b53e7833dd9713605845d2b3a 2023-03-28T10:16:27+02:00 fix multiple error aggregation: `errors.Wrapf` always returns nil if the first argument is nil. -c43e230cff6bdd811448d528699635387187b74f 2023-03-28T10:14:11+02:00 Egress firewall creation error was overridden by the status update error and never returned. That would prevent retry on failure. +# cluster-network-operator embedded-component 6878a2cec16309dcd96aaf03ae0d7db8f37d3cde to 529ff4a694ff0f4598d5763b20f78fe44cd14f22 +5dd5e9963ec960c0c6a1f28ad9137d1bfe2ba77f 2023-03-30T20:35:41+00:00 remove TLS_RSA_WITH_AES_128_CBC_SHA256 cipher +# ovn-kubernetes image-arm64 ffce71cb9cc045517288ed0f28a5d25c059d2438 to 3780f16d8e9c3a5495ba3b1caff3bc53070f6bb6 +0bc8f1412f1a462900961e4e54bc747b7a83d52a 2023-03-30T18:38:13+02:00 Optimize egress firewall cleanup to only select switches that have stale acls. +88ecd8b1b477c09a10bc7e151a181580fc8ca79f 2023-03-30T09:44:23+02:00 Batch potentially big transaction on egress firewall ACLs migration. The default transaction timeout is 10 seconds, it can be reached when we delete all egress firewall acls during migration to port groups from switches. +# kubernetes image-arm64 eab9cc98fe4c002916621ace6cdd623afa519203 to db63dbe4698bd34bab98717093af4f5424482286 +60398d079008c394fb817b1f5f37155dd47cc346 2023-03-30T18:47:02+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image +0ce7342c984110dfc93657d64df5dc3b2c0d1fe9 2023-03-15T13:31:32+00:00 Release commit for Kubernetes v1.25.8 +42c5d12dabca806ca24cf886b26f5eb29ebb7af7 2023-03-09T16:00:44-05:00 One lock among PodNominator and SchedulingQueue +360e5303abc8ef88f4fa7f388d303b81cb60c028 2023-03-09T10:09:17+01:00 releng/go: Update images, dependencies and version to Go 1.19.7 +a561bb21aa9eb60cc00f1f203f04bb16da3365da 2023-03-03T11:20:16+05:30 Fix for windows kube-proxy: 'externalTrafficPolicy: Local' results in no clusterIP entry in windows node. +e64823164d7569f2eea7ce43c8a5e6b45d8aec3d 2023-03-02T02:28:33+00:00 add unit test +ca14d024105553724722ba44d9b30f4f6e2e5fa5 2023-03-02T02:28:32+00:00 fix 116028 +fa67514717bd8ab66be9dd35de66b54e07d5168c 2023-02-28T17:11:26-03:00 Re-enable label selector +557582e467fa64bd468f793e3ba4645feb436fee 2023-02-28T17:11:26-03:00 Add integration test for diff --prune --selector +92fff2577a08b0db131193a63b7d5903b75d2d4c 2023-02-28T17:11:24-03:00 Use label selector for filtering out resources when pruning. Matches same behavior as for kubectl apply +33c239a372de8fae329ddc898c431621549bc355 2023-02-24T20:21:38+01:00 scheduler/framework/plugins/volumebinding: fix inaccurate log for when a volume is bound to a claim +1f40263f4f1b1a28e69172e9b364e6ec0af70751 2023-02-22T14:59:51+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.7 +0dd0c702133d51d69d0e6ed019820eeaecb1242f 2023-02-22T13:56:51+00:00 Release commit for Kubernetes v1.25.8-rc.0 +05844c82d10b2b735fba485a8fc32a53a3678a30 2023-02-14T17:47:25+00:00 Remove check for CSI driver running on node for CSI migration attach operations +792b44dfe04e1b832ed7959ac7d84d6e04235b52 2023-02-13T21:31:10-05:00 Simplify construction of /metrics request +02d8672f8f8b2c4d0c5e7b9e902f2fee733001e9 2023-02-10T09:57:24-07:00 test: remove flaky pod update test in CSIInlineVolumes e2e +8f09151d9c11b0219450ca8160fb770512fe68e5 2023-02-09T10:47:54-08:00 Move CSI json file saving to SetUpAt() +9be591d06a0a7da0100401deea1e39be18f171d6 2023-02-08T16:49:10+05:30 Fix for issue with Loadbalancer policy creation for IPV6 endpoints in Dualstack mode. +029bde8d3d2111d05c72b26f31779e43f0082254 2023-02-03T00:03:49-05:00 Invoke gimme from kube::golang::verify_go_version +8b8eee429c84938f17d9d6ed4c1c604810020a6f 2023-02-03T00:03:49-05:00 Add gimme +441276ceb06eb5804256ab8331e10da8b46c2f1e 2023-02-03T00:03:48-05:00 Defer builds to test-cmd and test-integration targets +514352be24319a5825de8ed23940beaf83cc04c4 2023-01-30T15:38:00-05:00 Carefully compute request path for metrics diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 46bfe690aa..a5180a2e9a 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -3,7 +3,7 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 992b43b https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 2076f3d0e4fea6fca54028ec7831407173ea81f5 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component b108134de5b1c7ef179fc523ffd62bc5898106a3 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 845ae423e831b1cacf0bcae5e6528f1d21b5ddf2 -https://github.com/openshift/cluster-network-operator embedded-component 6878a2cec16309dcd96aaf03ae0d7db8f37d3cde +https://github.com/openshift/cluster-network-operator embedded-component 529ff4a694ff0f4598d5763b20f78fe44cd14f22 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component d1915d130481541b8bacb5b98eddbc1541809d0a https://github.com/openshift/cluster-policy-controller embedded-component 139ac0499ac4d744023827ceb6d16aa6b467be27 https://github.com/openshift/etcd embedded-component c1d76ffd4b4cf0a0d2a6056a505fbef0b187c027 @@ -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 ffce71cb9cc045517288ed0f28a5d25c059d2438 -https://github.com/openshift/kubernetes image-arm64 eab9cc98fe4c002916621ace6cdd623afa519203 +https://github.com/openshift/ovn-kubernetes image-arm64 3780f16d8e9c3a5495ba3b1caff3bc53070f6bb6 +https://github.com/openshift/kubernetes image-arm64 db63dbe4698bd34bab98717093af4f5424482286 https://github.com/openshift/service-ca-operator image-arm64 299b7097a49385fdd4f86eccedc07f3a192e2504 From 0b25b068b24629d773bf354965304ab93de93711 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 6 Apr 2023 05:09:09 +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 96696ba639..bea757a05c 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:5adebe588ac1dac69767ed98e34943446fe3c8a3cf9a83f00f10c770d721f504" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a52684f0d87720d3b353216a57c5cb35cc80ae1e35120bafdb0107501295893" From 4d340e1ac789c956bd8bbcf71ed4fdd081733fa7 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 6 Apr 2023 05:09:10 +0000 Subject: [PATCH 4/4] update manifests --- assets/release/release-aarch64.json | 24 ++++++++++++------------ assets/release/release-x86_64.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index db12575cde..723096ffa1 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-03-30-084912" + "base": "4.12.0-0.nightly-arm64-2023-04-05-192947" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9e6a4aca31c9ed4c7ad57fe760da981541b3535a28e6c37098c78f3fcc9a1c2f", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:71bcd679a06b394854fde90dc133681eb69c6eb7bef3564b54cbd2982ba9c7b1", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ebd415abc99e64b5afda3a7fa3bf512602aae4488f1e4400c093801299b1c6a", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b3d9e90dd4ab535ec6d5512b4fbf739d33d61514bbd10d76fe98d2d5996ac35", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:92604f3a2a73da417fb38bf7be4f40546b4168a9ef408efce82d3f5c89583904", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9919ba22b8369cfb10259d251cbb8eea634261fd6cc47f3a120231298e0f21b6", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4277a96366ee50c04beee423aeeb607b41e44cb8508061f88d2d0c37f826004c", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e6388be9f536e053927f71269db8f15ee555102897fa80a25f0737bdfb072247", "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:e5931deade8033a5637208cce4efe29c6f008c47ae3e0c76161aea6ae67480ee", - "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70f5ba75da255a2f176b9d5d657c062b9206bf986d6b41f4f2ce3339a0caefb9", - "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22002726742d2f312fcf8a4ad27544de30bd41c9276ef69fd67d25335ae4a617", - "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d66df63eeced9bf996628cbd046d654bf26f5a51a8e199f42125d07126bb8dcf", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48f36418f9dae877fc618ab91ce84851e66099d2c1cc82e996936c9c5d244e17", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5adebe588ac1dac69767ed98e34943446fe3c8a3cf9a83f00f10c770d721f504", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e0beedf4bf2cc075705d11cb7c54b7a4ad802c33b084139d7f7990cc18afe4f" + "csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3c731149af34a83e9e9f5bdeb6c8e46e64d3b8a376f3d5f9ec7d53097770a23", + "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:58b0faf72d398d1a6df12d32828aaea069c3c637744ed76efbbe288c53b77e51", + "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0db2ac346bfb8dcefb4f21a2f73229e4300e0f714ad6236c80b7b4200e8c6fe2", + "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd66f82457e92a93846bdd557ba233dfcec1ab66690df74ed9a71c77e7b0e767", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c1eb5f5ea35859e4f31ea295001227977e545d5648fdbd71c415d5d9098c37e", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a52684f0d87720d3b353216a57c5cb35cc80ae1e35120bafdb0107501295893", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7016a4a5f0b043774015941a4c9477b664b7dfe751350557e3721d6d3bd7dede" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 0f54ec0372..24eef2aca5 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-04-03-132047" + "base": "4.12.0-0.nightly-2023-04-04-050651" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e43f69774d9411a1eece3f564e138e1eb547e7a8c08350987cda4e1d950adff3",