From 48676fa31c7af8fd67e43396a120df95be3edeea Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 31 Mar 2025 04:22:27 +0000 Subject: [PATCH 1/8] 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 68507b44bc..7a89828d53 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.17.0-0.nightly-2025-03-21-203905" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2025-03-21-203908" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2025-03-30-095330" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2025-03-30-095339" From c88fd8c40d67c49c946dfe9d2b7d14721a534978 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 31 Mar 2025 04:22:27 +0000 Subject: [PATCH 2/8] update changelog --- scripts/auto-rebase/changelog.txt | 60 ++++++++----------------------- scripts/auto-rebase/commits.txt | 10 +++--- 2 files changed, 19 insertions(+), 51 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index c162c181d3..b16aa22ee8 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,49 +1,17 @@ -- etcd embedded-component 23c5a247c3e601f7806a0bbffdc6d201a55bf469 to abfca6b7fe678873df8da0ca792877f882f0d522 - - 07097326 2025-03-17T22:15:52+01:00 Add support for cachi2 based deps - - 93b3c60b 2025-03-17T22:14:43+01:00 DOWNSTREAM : add native binary to installer images - - 7a38e602 2025-03-17T22:14:05+01:00 CORS-3249: DOWNSTREAM : installer: make etcd binaries static - - d12fb24f 2025-03-17T22:13:05+01:00 DOWNSTREAM : add installer Dockerfile for ART builds - - 2b591625 2025-03-17T22:09:05+01:00 DOWNSTREAM: : Add Dockerfile to build etcd for openshift-installer - - c8b5e016 2025-03-17T22:00:11+01:00 DOWNSTREAM : resolve merge conflicts - - 84ed0b2e 2025-03-17T21:59:23+01:00 NO-JIRA: use golang 1.22 image - - 5bca08ec 2025-01-25T08:14:51+13:00 version: bump up to 3.5.18 - - 0c8e7b19 2025-01-22T15:10:06+00:00 Ensure all goroutines created by StartEtcd to exit before closing the errc - - c6fcd270 2025-01-21T16:43:03-05:00 mvcc: restore tombstone index if it's first revision - - 3ff20e6f 2025-01-16T15:27:00-08:00 Bump go toolchain to 1.22.11 - - 80b0a73e 2025-01-11T07:17:00+00:00 Avoid deadlock in etcd.Close when stopping during bootstrapping - - e5b7e089 2025-01-10T16:16:10+00:00 etcdutl/etcdutl: use datadir package to build wal/snapdir - - 9b241941 2025-01-10T06:37:53+00:00 Remove duplicated <-s.ReadyNotify() - - b9a7aed9 2025-01-10T06:32:12+00:00 Do not wait for ready notify if the server is stopping - - 8943d8fc 2025-01-09T16:26:23-08:00 Update release_notes.tpl.txt - - f627f57e 2025-01-09T15:06:20-08:00 bump golang.org/x/net from 0.25.0 to 0.34.0 - - c5d14b46 2025-01-09T12:27:17-08:00 bump golang.org/x/crypto from 0.21.0 to 0.32.0 - - c1ab521a 2025-01-08T10:18:35+00:00 Fix mixVersion test case: ensure a snapshot to be sent out - - 5d284fda 2024-12-30T20:26:54+00:00 *: support custom content check offline in v2store - - 727c9b65 2024-12-04T14:13:14+05:30 Bump go toolchain to 1.22.9 - - 28a19f76 2024-12-03T18:29:39+00:00 Print warning message for deprecated flags if set - - 83045bca 2024-11-22T22:37:49+08:00 fix runtime error: comparing uncomparable type - - c84e84c5 2024-11-18T09:14:01+01:00 add tls min/max version to grpc proxy - - e61b4958 2024-11-15T13:24:38+01:00 Bump golang-jwt/jwt to 4.5.1 to address GO-2024-3250 - - 507c0de8 2024-11-12T09:30:31-07:00 version: bump up to 3.5.17 - - cb970e5c 2024-11-11T22:40:28-07:00 release: use GitHub's gh to create GitHub release - - 76275d62 2024-11-11T09:06:02+01:00 release: properly change working dir if tmp location already exists - - b2ba4882 2024-11-08T12:39:46+01:00 fix(defrag): close temp file in case of error - - bceca16a 2024-11-06T21:33:43-08:00 Bump go toolchain to 1.22.9 - - f26ff912 2024-11-06T14:18:35+01:00 chore(e2e): adapt defrag tests for 3.5 - - 1d175079 2024-11-06T14:05:04+01:00 fix(defrag): handle defragdb failure - - ae6655f1 2024-11-06T14:04:56+01:00 fix(defrag): handle no space left error - - 5ec08a23 2024-10-30T09:49:46+00:00 chore(e2e): backport TestNoErrorLogsDuringNormalOperations test - - 17ab1fa6 2024-10-29T12:18:35+13:00 Remove defunct actuated arm64 workflows. - - dea4eb3e 2024-10-28T12:15:59-07:00 [3.5] Fix risk of a partial write txn being applied - - e5905727 2024-10-25T19:08:05-07:00 [serverWatchStream] terminate recvLoop on sws.close() - - 2dbfe58a 2024-10-05T19:23:07+00:00 github/workflows: use ECR mirror for Trivy's DB - - 60217686 2024-10-02T23:39:04+05:30 Bump go version to 1.22.8 - - b56619e1 2024-09-17T01:24:48+00:00 Ensure commits are signed in scripts/release.sh. - - 6a3018fc 2024-09-12T08:43:57+02:00 docs: remove warning that etcd 3.5.0 was not yet released +- etcd embedded-component abfca6b7fe678873df8da0ca792877f882f0d522 to 0d9e0a907c4aea7c4b2bff627478785fb99511f5 + - 23b2cc12 2025-03-21T13:14:40+00:00 DOWNSTREAM: fix a compaction induce latency issue -- machine-config-operator embedded-component e22d6adfdffb9ee3af2b5518910c22e231306a25 to 1d0d635f2eb82057c5a533527639186f85394559 - - 1f0fbe8c 2025-03-17T14:21:07+00:00 kubelet_config_controller: Update ObservedGeneration render_controller: Make function name AreMCGeneratingSubControllersCompletedForPool explicit apihelpers: match the KubeletConfig to the Pool using MachineConfigPoolSelector +- machine-config-operator embedded-component 1d0d635f2eb82057c5a533527639186f85394559 to 143ea7b41456a4d9337cf5524cc5e51e9761bd4c + - bc61799e 2025-03-21T08:55:50+00:00 Fixing typos for MachineConfigNode + - 2e46d760 2025-03-20T12:18:07+01:00 Add crio dependency for ipsec.service + - 77e4ef21 2025-03-20T12:17:57+01:00 Add ipsec connect wait service -- operator-framework-olm embedded-component e9262fe971f881d6a014be70112b0f4cd5b82921 to 51e6ca2c24b6e231f175297acc5c8ff1eb5acf2b - - dc54ed61 2025-03-19T02:02:41+00:00 Ensure that PSA label is latest instead of pinning versions +- operator-framework-olm embedded-component 51e6ca2c24b6e231f175297acc5c8ff1eb5acf2b to d3b1715867b6e96a9ee71e158a9f0fd6ab6f792f + - 8d12ead4 2025-03-13T12:26:56+00:00 add missing pod disruption reasons to isPodDead (#3519) + +- ovn-kubernetes image-amd64 c621cdc876ffb219c7877a1db2f500ba541dba6c to b02d1af7d45ae88c91785ebc83ddec23348596cf + - a0ead881 2025-03-20T15:11:10+01:00 Update OVN to FDP25.A.1 24.03.5-40. + +- ovn-kubernetes image-arm64 c621cdc876ffb219c7877a1db2f500ba541dba6c to b02d1af7d45ae88c91785ebc83ddec23348596cf + - a0ead881 2025-03-20T15:11:10+01:00 Update OVN to FDP25.A.1 24.03.5-40. diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index e443d3957d..3e19ce99c6 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -9,12 +9,12 @@ https://github.com/openshift/cluster-network-operator embedded-component 8f0b637 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component b05a249d6919978217aefa7060951af078eac931 https://github.com/openshift/cluster-policy-controller embedded-component 7209e90d4205dc16bf0c83fb556c3d955d942d6b https://github.com/openshift/csi-external-snapshotter embedded-component aa558ca4bc55238e1909119f94eaf33872a76dec -https://github.com/openshift/etcd embedded-component abfca6b7fe678873df8da0ca792877f882f0d522 +https://github.com/openshift/etcd embedded-component 0d9e0a907c4aea7c4b2bff627478785fb99511f5 https://github.com/openshift/kubernetes embedded-component 98fe56995ed880a36943adc615688f2f5bd1a2d3 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 34fafc04e5f2872e282617da31175a7e091ffdb2 -https://github.com/openshift/machine-config-operator embedded-component 1d0d635f2eb82057c5a533527639186f85394559 +https://github.com/openshift/machine-config-operator embedded-component 143ea7b41456a4d9337cf5524cc5e51e9761bd4c https://github.com/openshift/openshift-controller-manager embedded-component 70aa014585cd33fc21f27ba20a722c71faf3c411 -https://github.com/openshift/operator-framework-olm embedded-component 51e6ca2c24b6e231f175297acc5c8ff1eb5acf2b +https://github.com/openshift/operator-framework-olm embedded-component d3b1715867b6e96a9ee71e158a9f0fd6ab6f792f https://github.com/openshift/route-controller-manager embedded-component a47f6be3676d3eabb864ca339584fe857e1076c5 https://github.com/openshift/service-ca-operator embedded-component 1f7d6472fea332fc307d9c8911f8c3cf57347755 https://github.com/openshift/oc image-amd64 0000b3ef257d07f423dfdf9b6d274214d1b0c846 @@ -23,7 +23,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 aa558ca4bc5523 https://github.com/openshift/csi-external-snapshotter image-amd64 aa558ca4bc55238e1909119f94eaf33872a76dec https://github.com/openshift/router image-amd64 a33f2b6ad04f8c39b95c1839340f0e38b5c0662a https://github.com/openshift/kube-rbac-proxy image-amd64 7718265cc7640f6fa0d75eee366e424911d6f00f -https://github.com/openshift/ovn-kubernetes image-amd64 c621cdc876ffb219c7877a1db2f500ba541dba6c +https://github.com/openshift/ovn-kubernetes image-amd64 b02d1af7d45ae88c91785ebc83ddec23348596cf https://github.com/openshift/kubernetes image-amd64 98fe56995ed880a36943adc615688f2f5bd1a2d3 https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755 https://github.com/openshift/oc image-arm64 0000b3ef257d07f423dfdf9b6d274214d1b0c846 @@ -32,6 +32,6 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 aa558ca4bc5523 https://github.com/openshift/csi-external-snapshotter image-arm64 aa558ca4bc55238e1909119f94eaf33872a76dec https://github.com/openshift/router image-arm64 a33f2b6ad04f8c39b95c1839340f0e38b5c0662a https://github.com/openshift/kube-rbac-proxy image-arm64 7718265cc7640f6fa0d75eee366e424911d6f00f -https://github.com/openshift/ovn-kubernetes image-arm64 c621cdc876ffb219c7877a1db2f500ba541dba6c +https://github.com/openshift/ovn-kubernetes image-arm64 b02d1af7d45ae88c91785ebc83ddec23348596cf https://github.com/openshift/kubernetes image-arm64 98fe56995ed880a36943adc615688f2f5bd1a2d3 https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755 From 092a64c5d698ab9c4b6b035138237d371b708c1f Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 31 Mar 2025 04:22:54 +0000 Subject: [PATCH 3/8] update microshift/go.mod --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index c2cd9ec430..f6a4e9940a 100644 --- a/go.mod +++ b/go.mod @@ -252,9 +252,9 @@ replace ( ) replace ( - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250321131051-abfca6b7fe67 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67 // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250321131051-abfca6b7fe67 // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd ) replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2 // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator diff --git a/go.sum b/go.sum index b01e9e309e..a654ba0537 100644 --- a/go.sum +++ b/go.sum @@ -461,12 +461,12 @@ github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 h1:JtLhaGpSEco github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87/go.mod h1:3IPD4U0qyovZS4EFady2kqY32m8lGcbs/Wx+yprg9z8= github.com/openshift/cluster-policy-controller v0.0.0-20240912153445-7209e90d4205 h1:0BJ5e4qV2RQKz+4yeQrKIi5PJQ/HlcK9I7jEFhcoB4s= github.com/openshift/cluster-policy-controller v0.0.0-20240912153445-7209e90d4205/go.mod h1:kcmuMziFH9/IdFAZwbBwO49c4Dspy+hsvHeV2nC3b4A= -github.com/openshift/etcd/api/v3 v3.5.1-0.20250321131051-abfca6b7fe67 h1:vg1EKpxpEMPTORr0oGfp9lC7fVpkzOEb7/yl6XVk89k= -github.com/openshift/etcd/api/v3 v3.5.1-0.20250321131051-abfca6b7fe67/go.mod h1:uY03Ob2H50077J7Qq0DeehjM/A9S8PhVfbQ1mSaMopU= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67 h1:AiUJPSSK1FP1WSpkRMNeodQfS7tcB9buD0vaTkRK9Q4= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67/go.mod h1:BxVf2o5wXG9ZJV+/Cu7QNUiJYk4A29sAhoI5tIRsCu4= -github.com/openshift/etcd/client/v3 v3.5.1-0.20250321131051-abfca6b7fe67 h1:gaqXHtWNg5p0NgKxfCVwiJT7VldXrxG1hWFgxYMxPN0= -github.com/openshift/etcd/client/v3 v3.5.1-0.20250321131051-abfca6b7fe67/go.mod h1:kmemwOsPU9broExyhYsBxX4spCTDX3yLgPMWtpBXG6E= +github.com/openshift/etcd/api/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:KDmVLESmkDriKG4MPZqM2tLXOkPBU42g/vx5+uJpipg= +github.com/openshift/etcd/api/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:uY03Ob2H50077J7Qq0DeehjM/A9S8PhVfbQ1mSaMopU= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:qUwxpfcARa5CUStVCc8wn/RPxVFXUP/QULvwMhWEwIc= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:BxVf2o5wXG9ZJV+/Cu7QNUiJYk4A29sAhoI5tIRsCu4= +github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:Cy1JopdDy8ee4sMnik5QlEFMcVFp9iffEc6uInOSMCI= +github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:kmemwOsPU9broExyhYsBxX4spCTDX3yLgPMWtpBXG6E= github.com/openshift/kubernetes v0.0.0-20250220215240-98fe56995ed8 h1:zlnsoVI85fO1mvfd7OqkyU0Go0u3+roGtivbRoMzJDE= github.com/openshift/kubernetes v0.0.0-20250220215240-98fe56995ed8/go.mod h1:FQuZaXhZ7grWVTRguqQKYJRwT2AggH0cJfAuvpGIwvo= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2 h1:Eq3Ql8dFdv5hvkxKGTxxLb22xcin771AvZj+24HlCI0= From 80286c868933b0800395c2f64c0eb0c4c9aed22b Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 31 Mar 2025 04:23:17 +0000 Subject: [PATCH 4/8] update microshift/vendor --- vendor/modules.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vendor/modules.txt b/vendor/modules.txt index eb17a34fed..fb48b48ad6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -868,7 +868,7 @@ github.com/vishvananda/netns # github.com/xlab/treeprint v1.2.0 ## explicit; go 1.13 github.com/xlab/treeprint -# go.etcd.io/etcd/api/v3 v3.5.18 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250321131051-abfca6b7fe67 +# go.etcd.io/etcd/api/v3 v3.5.18 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250325012632-0d9e0a907c4a ## explicit; go 1.22 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -876,7 +876,7 @@ go.etcd.io/etcd/api/v3/membershippb go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version -# go.etcd.io/etcd/client/pkg/v3 v3.5.18 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67 +# go.etcd.io/etcd/client/pkg/v3 v3.5.18 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a ## explicit; go 1.22 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -884,7 +884,7 @@ go.etcd.io/etcd/client/pkg/v3/systemd go.etcd.io/etcd/client/pkg/v3/tlsutil go.etcd.io/etcd/client/pkg/v3/transport go.etcd.io/etcd/client/pkg/v3/types -# go.etcd.io/etcd/client/v3 v3.5.10 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250321131051-abfca6b7fe67 +# go.etcd.io/etcd/client/v3 v3.5.10 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a ## explicit; go 1.22 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/credentials @@ -3257,8 +3257,8 @@ sigs.k8s.io/yaml # k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250220215240-98fe56995ed8 # k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250220215240-98fe56995ed8 # k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250220215240-98fe56995ed8 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250321131051-abfca6b7fe67 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250321131051-abfca6b7fe67 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250325012632-0d9e0a907c4a +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2 # k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250220215240-98fe56995ed8 From 03da8914af8792e937711784a2f07867b79a64c2 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 31 Mar 2025 04:23:18 +0000 Subject: [PATCH 5/8] update etcd/go.mod --- etcd/go.mod | 12 ++++++------ etcd/go.sum | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index d608c2ef67..d15faf99f1 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -144,12 +144,12 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d // from kubernetes - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250321131051-abfca6b7fe67 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67 // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250321131051-abfca6b7fe67 // from etcd - go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67 // from etcd - go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250321131051-abfca6b7fe67 // from etcd - go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250321131051-abfca6b7fe67 // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd + go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd + go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd + go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250220215240-98fe56995ed8 // staging kubernetes k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250220215240-98fe56995ed8 // staging kubernetes k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250220215240-98fe56995ed8 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index a164e797aa..946e960809 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -188,18 +188,18 @@ github.com/openshift/api v0.0.0-20240530053948-b01900f1982a h1:EyLN5c8dxine8V9Xa github.com/openshift/api v0.0.0-20240530053948-b01900f1982a/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM= github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52 h1:bqBwrXG7sbJUqP1Og1bR8FvVh7qb7CrMgy9saKmOZFs= github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= -github.com/openshift/etcd/api/v3 v3.5.1-0.20250321131051-abfca6b7fe67 h1:vg1EKpxpEMPTORr0oGfp9lC7fVpkzOEb7/yl6XVk89k= -github.com/openshift/etcd/api/v3 v3.5.1-0.20250321131051-abfca6b7fe67/go.mod h1:uY03Ob2H50077J7Qq0DeehjM/A9S8PhVfbQ1mSaMopU= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67 h1:AiUJPSSK1FP1WSpkRMNeodQfS7tcB9buD0vaTkRK9Q4= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67/go.mod h1:BxVf2o5wXG9ZJV+/Cu7QNUiJYk4A29sAhoI5tIRsCu4= -github.com/openshift/etcd/client/v3 v3.5.1-0.20250321131051-abfca6b7fe67 h1:gaqXHtWNg5p0NgKxfCVwiJT7VldXrxG1hWFgxYMxPN0= -github.com/openshift/etcd/client/v3 v3.5.1-0.20250321131051-abfca6b7fe67/go.mod h1:kmemwOsPU9broExyhYsBxX4spCTDX3yLgPMWtpBXG6E= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67 h1:FTAEt3cam2o7XUf95LznKjJL8PUHiZK9WXY0n5IXY1o= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67/go.mod h1:gb4CDXuN/OgzUgj+VmUFumLYQ2FUMDC6r/plLIjHPI8= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20250321131051-abfca6b7fe67 h1:ajbPQl76LrBfP8IUiSZoRhi6vg8b8BaHLOUlOjS6mD8= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20250321131051-abfca6b7fe67/go.mod h1:XBaZHTJt3nLnpS8hMDR55Sxrq76cEC4xWYMBYSY3jcs= -github.com/openshift/etcd/server/v3 v3.5.1-0.20250321131051-abfca6b7fe67 h1:EiwmxtPnQrTzWT/p3foglF+5tsdUiQWU+V/EjNHirwA= -github.com/openshift/etcd/server/v3 v3.5.1-0.20250321131051-abfca6b7fe67/go.mod h1:waeL2uw6TdXniXaus105tiK1aSbblIBi21uk8y7D6Ng= +github.com/openshift/etcd/api/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:KDmVLESmkDriKG4MPZqM2tLXOkPBU42g/vx5+uJpipg= +github.com/openshift/etcd/api/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:uY03Ob2H50077J7Qq0DeehjM/A9S8PhVfbQ1mSaMopU= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:qUwxpfcARa5CUStVCc8wn/RPxVFXUP/QULvwMhWEwIc= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:BxVf2o5wXG9ZJV+/Cu7QNUiJYk4A29sAhoI5tIRsCu4= +github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:Cy1JopdDy8ee4sMnik5QlEFMcVFp9iffEc6uInOSMCI= +github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:kmemwOsPU9broExyhYsBxX4spCTDX3yLgPMWtpBXG6E= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:F8jRsELr4KTSxh1YTjLWbj3bPRlzmY8sAjigjN4L6co= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:gb4CDXuN/OgzUgj+VmUFumLYQ2FUMDC6r/plLIjHPI8= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:uj9xDiUqkD3pa0CxGChj9A5RKWEV5mEMww2NU2K3qms= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:XBaZHTJt3nLnpS8hMDR55Sxrq76cEC4xWYMBYSY3jcs= +github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:zqzMxqY1vJ2OG1WxTjkoyGD62AHI/JuTxJtEkmkbgDc= +github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:waeL2uw6TdXniXaus105tiK1aSbblIBi21uk8y7D6Ng= github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250220215240-98fe56995ed8 h1:9hBOGDodzfsCybJB1IFHQjy1NIPmlmId1TYBzS/fblM= github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250220215240-98fe56995ed8/go.mod h1:hMUQemCrSBowF7/LZGr+EhP5qHwJimo5aDDjsUUdc6s= github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250220215240-98fe56995ed8 h1:AkhckUDfYSwrd438MjkgXvL8uOi1yve1xLmOqN66oeY= From 32c249dede121019fa756f0bac5656d872a449d6 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 31 Mar 2025 04:23:24 +0000 Subject: [PATCH 6/8] update etcd/vendor --- .../etcd/server/v3/mvcc/kvstore_compaction.go | 4 +--- etcd/vendor/modules.txt | 24 +++++++++---------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore_compaction.go b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore_compaction.go index ad8c5cb5bc..6f3d1e59a7 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore_compaction.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore_compaction.go @@ -39,8 +39,6 @@ func (s *store) scheduleCompaction(compactMainRev, prevCompactRev int64) (KeyVal binary.BigEndian.PutUint64(end, uint64(compactMainRev+1)) batchNum := s.cfg.CompactionBatchLimit - batchTicker := time.NewTicker(s.cfg.CompactionSleepInterval) - defer batchTicker.Stop() h := newKVHasher(prevCompactRev, compactMainRev, keep) last := make([]byte, 8+1+8) @@ -90,7 +88,7 @@ func (s *store) scheduleCompaction(compactMainRev, prevCompactRev int64) (KeyVal dbCompactionPauseMs.Observe(float64(time.Since(start) / time.Millisecond)) select { - case <-batchTicker.C: + case <-time.After(s.cfg.CompactionSleepInterval): case <-s.stopc: return KeyValueHash{}, fmt.Errorf("interrupted due to stop signal") } diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index b855b6d638..2bc827a159 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -270,7 +270,7 @@ github.com/xlab/treeprint # go.etcd.io/bbolt v1.3.11 ## explicit; go 1.22 go.etcd.io/bbolt -# go.etcd.io/etcd/api/v3 v3.5.18 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250321131051-abfca6b7fe67 +# go.etcd.io/etcd/api/v3 v3.5.18 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250325012632-0d9e0a907c4a ## explicit; go 1.22 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -279,7 +279,7 @@ go.etcd.io/etcd/api/v3/membershippb go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version -# go.etcd.io/etcd/client/pkg/v3 v3.5.18 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67 +# go.etcd.io/etcd/client/pkg/v3 v3.5.18 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a ## explicit; go 1.22 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -292,14 +292,14 @@ go.etcd.io/etcd/client/pkg/v3/types # go.etcd.io/etcd/client/v2 v2.305.18 ## explicit; go 1.22 go.etcd.io/etcd/client/v2 -# go.etcd.io/etcd/client/v3 v3.5.18 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250321131051-abfca6b7fe67 +# go.etcd.io/etcd/client/v3 v3.5.18 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a ## explicit; go 1.22 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/concurrency go.etcd.io/etcd/client/v3/credentials go.etcd.io/etcd/client/v3/internal/endpoint go.etcd.io/etcd/client/v3/internal/resolver -# go.etcd.io/etcd/pkg/v3 v3.5.18 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67 +# go.etcd.io/etcd/pkg/v3 v3.5.18 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a ## explicit; go 1.22 go.etcd.io/etcd/pkg/v3/adt go.etcd.io/etcd/pkg/v3/contention @@ -316,14 +316,14 @@ go.etcd.io/etcd/pkg/v3/runtime go.etcd.io/etcd/pkg/v3/schedule go.etcd.io/etcd/pkg/v3/traceutil go.etcd.io/etcd/pkg/v3/wait -# go.etcd.io/etcd/raft/v3 v3.5.18 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250321131051-abfca6b7fe67 +# go.etcd.io/etcd/raft/v3 v3.5.18 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a ## explicit; go 1.22 go.etcd.io/etcd/raft/v3 go.etcd.io/etcd/raft/v3/confchange go.etcd.io/etcd/raft/v3/quorum go.etcd.io/etcd/raft/v3/raftpb go.etcd.io/etcd/raft/v3/tracker -# go.etcd.io/etcd/server/v3 v3.5.10 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250321131051-abfca6b7fe67 +# go.etcd.io/etcd/server/v3 v3.5.10 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a ## explicit; go 1.22 go.etcd.io/etcd/server/v3/auth go.etcd.io/etcd/server/v3/config @@ -1050,12 +1050,12 @@ sigs.k8s.io/yaml # github.com/openshift/microshift/pkg/config => ../pkg/config # github.com/openshift/microshift/pkg/util/cryptomaterial => ../pkg/util/cryptomaterial # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250321131051-abfca6b7fe67 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250321131051-abfca6b7fe67 -# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67 -# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250321131051-abfca6b7fe67 -# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250321131051-abfca6b7fe67 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250325012632-0d9e0a907c4a +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a +# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a +# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a +# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a # k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250220215240-98fe56995ed8 # k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250220215240-98fe56995ed8 # k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250220215240-98fe56995ed8 From c87bcc8cbecc2ca71a139c3e60a011811d4929a7 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 31 Mar 2025 04:23:25 +0000 Subject: [PATCH 7/8] update manifests --- assets/optional/multus/release-multus-aarch64.json | 2 +- assets/optional/multus/release-multus-x86_64.json | 2 +- .../operator-lifecycle-manager/kustomization.aarch64.yaml | 8 ++++---- .../operator-lifecycle-manager/kustomization.x86_64.yaml | 8 ++++---- .../operator-lifecycle-manager/release-olm-aarch64.json | 6 +++--- .../operator-lifecycle-manager/release-olm-x86_64.json | 6 +++--- assets/release/release-aarch64.json | 4 ++-- assets/release/release-x86_64.json | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index b9ce0f531d..c5d2412f50 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2025-03-21-203908" + "base": "4.17.0-0.nightly-arm64-2025-03-30-095339" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bcdeafc4d3b536b8404ff9c386641ab91c9a89a8f5f139a2e38605cb97efaf4f", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 62e0eec0fb..015d022ef3 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.17.0-0.nightly-2025-03-21-203905" + "base": "4.17.0-0.nightly-2025-03-30-095330" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0f93cbbd028d351a9233d751909be9c1d604c2e7a0a26f775910c2eaa670334", diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 82880d3201..246e5ad520 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:87f570165ee65ef1bcd57d1165dc6e6e57d3598ccc68a1b81e798c1d6fe28ee2 + digest: sha256:32ca867c6a43749af3cfd51560a9a4ddde1d8058746c2a25cea5d62a92c33219 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:9822a8338272fb124fddf217be4933b9759f846de3d0ddc1f77b7d4ac78156b2 + digest: sha256:ffe8d39c0494c5c2c69f206c1658dee5704654402cc7cee2c4f93dcba1b29914 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:bb50690f218a3432fa9bc3bf4f684d4d43956add2bd2f168ded3b30be5f8a999 @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9822a8338272fb124fddf217be4933b9759f846de3d0ddc1f77b7d4ac78156b2 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffe8d39c0494c5c2c69f206c1658dee5704654402cc7cee2c4f93dcba1b29914 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87f570165ee65ef1bcd57d1165dc6e6e57d3598ccc68a1b81e798c1d6fe28ee2 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32ca867c6a43749af3cfd51560a9a4ddde1d8058746c2a25cea5d62a92c33219 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 59332c9954..13c84ad509 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:e5b3f22c2fc3c5c7fd26239ae79d4954bed36956df69854af6247f9e0d683725 + digest: sha256:e13f78b6d152078060b9aea818c632a9ca07ec66854bee6c246767e422c6aef3 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:1729c087f7ab2bd110d260ebbfd595ea681fbdeca4a28fa5565526edc0da8b48 + digest: sha256:6855dcc19a4c1715e1bfcf1005f46434a7fcb714d9a911a894e519b065a75bf8 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:6e4f75ceee40445563645e5f4ac11c0b0829550af20d4c38886afac6da3c0036 @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1729c087f7ab2bd110d260ebbfd595ea681fbdeca4a28fa5565526edc0da8b48 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6855dcc19a4c1715e1bfcf1005f46434a7fcb714d9a911a894e519b065a75bf8 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5b3f22c2fc3c5c7fd26239ae79d4954bed36956df69854af6247f9e0d683725 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e13f78b6d152078060b9aea818c632a9ca07ec66854bee6c246767e422c6aef3 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index f923c855cc..b59ef97d3d 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2025-03-21-203908" + "base": "4.17.0-0.nightly-arm64-2025-03-30-095339" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87f570165ee65ef1bcd57d1165dc6e6e57d3598ccc68a1b81e798c1d6fe28ee2", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9822a8338272fb124fddf217be4933b9759f846de3d0ddc1f77b7d4ac78156b2", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32ca867c6a43749af3cfd51560a9a4ddde1d8058746c2a25cea5d62a92c33219", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffe8d39c0494c5c2c69f206c1658dee5704654402cc7cee2c4f93dcba1b29914", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb50690f218a3432fa9bc3bf4f684d4d43956add2bd2f168ded3b30be5f8a999" } } diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index b7cc1aa361..6f3896b318 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.17.0-0.nightly-2025-03-21-203905" + "base": "4.17.0-0.nightly-2025-03-30-095330" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5b3f22c2fc3c5c7fd26239ae79d4954bed36956df69854af6247f9e0d683725", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1729c087f7ab2bd110d260ebbfd595ea681fbdeca4a28fa5565526edc0da8b48", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e13f78b6d152078060b9aea818c632a9ca07ec66854bee6c246767e422c6aef3", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6855dcc19a4c1715e1bfcf1005f46434a7fcb714d9a911a894e519b065a75bf8", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e4f75ceee40445563645e5f4ac11c0b0829550af20d4c38886afac6da3c0036" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index b85c6ee39b..a8c4667a74 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,13 +1,13 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2025-03-21-203908" + "base": "4.17.0-0.nightly-arm64-2025-03-30-095339" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3faa8c92cf36942be1c790440c315a0c69b31b5b73cb02424beccdb1a1b9a45", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a647bd3b53dfa0ef60937b668f50b8bb00892efa76e285d3384b24b24294a358", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0528a04c55a77af19587214b35f4617b67cc7a7a2811124f353be126a026455", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb50690f218a3432fa9bc3bf4f684d4d43956add2bd2f168ded3b30be5f8a999", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af4c197ab6b0e6a9347694e5be4c8ccc9fe1e3fd4ac4083a3ede5370bff83801", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1780ca8ee737875afb6c8a96601d414ca505840dfd544280af6fa94f3f352f95", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05f52a1fe755bdf22e11b31feee75b190de72e7cab6bd709c91441f8b6e77457", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:59a722f6cc29be056935a86c365111d3d836c00edb4b81ec52da9cca4cc446ef", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 247092e319..8593c60aaa 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,13 +1,13 @@ { "release": { - "base": "4.17.0-0.nightly-2025-03-21-203905" + "base": "4.17.0-0.nightly-2025-03-30-095330" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26f9af72197f11c62f80b34c4f6fe1c2f6dcc0ecc9591e9b4347a92c4da2509d", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da1680f5cb1a52583d0ae54f4b25a3763e36fdac3c4f4f4cbe8051deace50ad9", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83dacde2460b57671d199d19682f896a8e615a16a5e4499d01f861d10f6c63f9", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e4f75ceee40445563645e5f4ac11c0b0829550af20d4c38886afac6da3c0036", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c4fd62521458c124bf6a1fa5b7350bb585d57715d4fc395a672d0eaa9a6c628", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:afbe2210f9bb66fc9f0263919119286397258a0cacbc9e2e0e8111029268aac7", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5c59fac3063f0a93c52e24c2edee144b61a1cb457b8f1225e85fb6971479e2f", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db09b4618ecb561d858ab191f63a26b6c2b349a71180abaf7730bcc61544561d", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e", From b320a95b9975bfe9c68ce597fe47666054ea812e Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 31 Mar 2025 04:23:26 +0000 Subject: [PATCH 8/8] update buildfiles --- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index e64744adeb..eb768a4403 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-arm64-2025-03-21-203908 +OCP_VERSION := 4.17.0-0.nightly-arm64-2025-03-30-095339 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index b76f52a4f8..571e2a62d6 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-2025-03-21-203905 +OCP_VERSION := 4.17.0-0.nightly-2025-03-30-095330