From 9e1543c1a07a5f06636b522f22722184ba8c117f Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 28 May 2024 05:07:27 +0000 Subject: [PATCH 1/9] 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 b4fa28132e..a7e2ef6625 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.14.0-0.nightly-2024-05-20-155905" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-05-23-123237" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-05-27-130305" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-05-27-120012" From d52fc60c77d1b0501f1cf37ce11c99126c93b36a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 28 May 2024 05:07:27 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 19 +++++++++++++++++++ scripts/auto-rebase/commits.txt | 12 ++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..1477cb931e 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,19 @@ +- cluster-ingress-operator embedded-component d876f5ab48e3748057ec196d90b6f7aae633b081 to fc4cab0d129151b919ac09b495c33d627ef55915 + - 157b281 2024-05-23T21:26:40+00:00 Use centos7 tag for quay.io/centos7/httpd-24-centos7 image + +- cluster-kube-apiserver-operator embedded-component 2eab0f9e27db4399bf8885d62ca338c3d02fdd35 to 4302637f4d521bd9880de93df6bc41d44a4b0756 + - 6956952 2024-05-20T09:36:32+02:00 go mod tidy && go mod vendor + - 268e65e 2024-05-20T09:32:38+02:00 add a controller that reconciles SCCs' volumes + +- etcd embedded-component b0c0321e61acdf93649ff4b753b2a399ffff411b to 5ed5044c5661c55d297ab0348056b50969af9627 + - 51a70ffb 2024-04-24T09:31:04-04:00 Revert "Merge pull request #261 from Elbehery/rebase-etcd-3.5.13-openshift-4.14" + +- machine-config-operator embedded-component 83d66a9228fef00885826e00ad3d392c5525bfab to 0eac83ac1e841b60677c1ae3f7f3ce07abff8d3a + - 7b4adcdb 2024-05-14T13:21:56+00:00 Don't error if the certs.d dir doesn't exist yet + +- ovn-kubernetes image-amd64 4f1ff16966404db73da7a64c5e0e535847c5dbbe to d52ee0f64093a606b3b79ed66221720a58d25433 + - 21402bf 2024-05-09T18:56:07+05:30 drop-forwarding: Add ClusterSubnets to allowed forwarding CIDRs + +- ovn-kubernetes image-arm64 4f1ff16966404db73da7a64c5e0e535847c5dbbe to d52ee0f64093a606b3b79ed66221720a58d25433 + - 21402bf 2024-05-09T18:56:07+05:30 drop-forwarding: Add ClusterSubnets to allowed forwarding CIDRs + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 4699b3a3b9..5be9145d41 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,17 +1,17 @@ https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component d4a1162514ecbf248b04e6e8625d17bc2b775ccd https://github.com/openshift/cluster-dns-operator embedded-component 5553a22698ac7fce2cc401ed5884eb1bdb36a02d -https://github.com/openshift/cluster-ingress-operator embedded-component d876f5ab48e3748057ec196d90b6f7aae633b081 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 2eab0f9e27db4399bf8885d62ca338c3d02fdd35 +https://github.com/openshift/cluster-ingress-operator embedded-component fc4cab0d129151b919ac09b495c33d627ef55915 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 4302637f4d521bd9880de93df6bc41d44a4b0756 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 4e059638c2cbf003551ee699106dc024760eece3 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 33f630dc1f890ca59c5e57fb5b6cc24a3f22a1d4 https://github.com/openshift/cluster-network-operator embedded-component d429c8bc14a64bd56fb9160b218bfa75a891219f https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 3985c55f99e1ea013be2db096059c09b2ed98118 https://github.com/openshift/cluster-policy-controller embedded-component 219f6f6f072d867201d4923d39fd8bcaecbe7c59 https://github.com/openshift/csi-external-snapshotter embedded-component a6834536936b16dcd9ee81a8753a2ef6dc208541 -https://github.com/openshift/etcd embedded-component b0c0321e61acdf93649ff4b753b2a399ffff411b +https://github.com/openshift/etcd embedded-component 5ed5044c5661c55d297ab0348056b50969af9627 https://github.com/openshift/kubernetes embedded-component 048520e2550f287e0b8013cd53b2bf74e6af1529 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 8558e14a116804168506d06e96eac5a79913a6eb -https://github.com/openshift/machine-config-operator embedded-component 83d66a9228fef00885826e00ad3d392c5525bfab +https://github.com/openshift/machine-config-operator embedded-component 0eac83ac1e841b60677c1ae3f7f3ce07abff8d3a https://github.com/openshift/openshift-controller-manager embedded-component 27209ef14fcfca236ddba24ac7289bb3d01be8e6 https://github.com/openshift/route-controller-manager embedded-component 1a5e72f41b21f5ebcd6f9dd8227d92ad1fffbb1e https://github.com/openshift/service-ca-operator embedded-component 3c3f82f7112ee4b5656e5c554f9887acdf881175 @@ -22,7 +22,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 a6834536936b16 https://github.com/openshift/csi-external-snapshotter image-amd64 a6834536936b16dcd9ee81a8753a2ef6dc208541 https://github.com/openshift/router image-amd64 99b0c3119a0e2c7db4775cd58dcdb3e33dda9d3e https://github.com/openshift/kube-rbac-proxy image-amd64 1a646b98d8864e53accb726531d86f084ab13977 -https://github.com/openshift/ovn-kubernetes image-amd64 4f1ff16966404db73da7a64c5e0e535847c5dbbe +https://github.com/openshift/ovn-kubernetes image-amd64 d52ee0f64093a606b3b79ed66221720a58d25433 https://github.com/openshift/kubernetes image-amd64 048520e2550f287e0b8013cd53b2bf74e6af1529 https://github.com/openshift/service-ca-operator image-amd64 3c3f82f7112ee4b5656e5c554f9887acdf881175 https://github.com/openshift/oc image-arm64 f7b14a92857ad1f28be2e2eaec3ae8229d4c2761 @@ -32,6 +32,6 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 a6834536936b16 https://github.com/openshift/csi-external-snapshotter image-arm64 a6834536936b16dcd9ee81a8753a2ef6dc208541 https://github.com/openshift/router image-arm64 99b0c3119a0e2c7db4775cd58dcdb3e33dda9d3e https://github.com/openshift/kube-rbac-proxy image-arm64 1a646b98d8864e53accb726531d86f084ab13977 -https://github.com/openshift/ovn-kubernetes image-arm64 4f1ff16966404db73da7a64c5e0e535847c5dbbe +https://github.com/openshift/ovn-kubernetes image-arm64 d52ee0f64093a606b3b79ed66221720a58d25433 https://github.com/openshift/kubernetes image-arm64 048520e2550f287e0b8013cd53b2bf74e6af1529 https://github.com/openshift/service-ca-operator image-arm64 3c3f82f7112ee4b5656e5c554f9887acdf881175 From 6ed7837932d88447adad0824e7f416166daca652 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 28 May 2024 05:08:05 +0000 Subject: [PATCH 3/9] 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 23ffa3826b..c78fd46c0a 100644 --- a/go.mod +++ b/go.mod @@ -272,9 +272,9 @@ replace ( ) replace ( - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240520164943-5ed5044c5661 // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240520164943-5ed5044c5661 // from etcd ) replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20230724151845-8558e14a1168 // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator diff --git a/go.sum b/go.sum index 2dc418bf2f..1b2d56feed 100644 --- a/go.sum +++ b/go.sum @@ -527,12 +527,12 @@ github.com/openshift/client-go v0.0.0-20230807132528-be5346fb33cb h1:laYRaVm1tMd github.com/openshift/client-go v0.0.0-20230807132528-be5346fb33cb/go.mod h1:eCLby3OeidJ9+8GcvvGROU6hsCv2XAPQw8EO7d8NbQA= github.com/openshift/cluster-policy-controller v0.0.0-20231027165954-219f6f6f072d h1:Y3Y90mAiEIKhAMJLjl4yPEj6k6Ja+huTI/ZKyp12MZc= github.com/openshift/cluster-policy-controller v0.0.0-20231027165954-219f6f6f072d/go.mod h1:rXrp+7IWLmCxDbD9eQp82PINCIdk2YYfpxd4OEvL03E= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:U849p7TYPDOn10NOFUq2N4sQ/wmoFATuO+0I+QdYeoQ= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:QwsgXhxP1oarPmZ2PN/q64kJOGkH6ivRldlxiy5hmO8= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:l0SY5owduZwbAofIjNPmyJtbQ2dgFFmJ9ytvzeELRDI= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:cqiAeY8b5DEEcpxvgWKsbLIWNM/8Wy2xJSDMtioMcoI= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1:PhLpkbh8u9A13wRtRRY8Wdi/hSyJl1kPUhefR/HXV5k= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1:jek+dBXmSH2TRnkidLBMjpa8vWoIwGYZrxDxnX9ey+c= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1:CSoRU2XPMMRziq/pDD3H9pJA5ZJS+KkpaoRLzAxmvak= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw= github.com/openshift/kubernetes v0.0.0-20240516144826-048520e2550f h1:gMDwIKIM8wDrlgemeOZyzvDVdxqvGt0QaqWryJFS0rQ= github.com/openshift/kubernetes v0.0.0-20240516144826-048520e2550f/go.mod h1:lGAQJVZaMzHt9tzwp2oMDSf/W6k0w7AUS3jG2EM1Ing= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20230724151845-8558e14a1168 h1:gjPs80PVnSOjK7oBizuGNphNNYBdaevQBw0EvQ5/fsQ= From a0cc6f36314d8d253ba3e5c74818e30158c50a64 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 28 May 2024 05:08:45 +0000 Subject: [PATCH 4/9] update microshift/vendor --- .../go.etcd.io/etcd/api/v3/version/version.go | 2 +- .../pkg/v3/transport/keepalive_listener.go | 5 ++++ .../transport/keepalive_listener_openbsd.go | 26 ------------------- .../v3/transport/keepalive_listener_unix.go | 24 ----------------- .../etcd/client/pkg/v3/types/urls.go | 21 ++++++--------- vendor/go.etcd.io/etcd/client/v3/client.go | 19 ++------------ vendor/go.etcd.io/etcd/client/v3/config.go | 9 ------- vendor/modules.txt | 18 ++++++------- 8 files changed, 25 insertions(+), 99 deletions(-) delete mode 100644 vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_openbsd.go delete mode 100644 vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_unix.go diff --git a/vendor/go.etcd.io/etcd/api/v3/version/version.go b/vendor/go.etcd.io/etcd/api/v3/version/version.go index d20b3a0202..4858a08bfe 100644 --- a/vendor/go.etcd.io/etcd/api/v3/version/version.go +++ b/vendor/go.etcd.io/etcd/api/v3/version/version.go @@ -26,7 +26,7 @@ import ( var ( // MinClusterVersion is the min cluster version this etcd binary is compatible with. MinClusterVersion = "3.0.0" - Version = "3.5.13" + Version = "3.5.12" APIVersion = "unknown" // Git SHA Value will be set during build diff --git a/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener.go b/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener.go index d00a93dc19..2241d8823e 100644 --- a/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener.go +++ b/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener.go @@ -87,6 +87,11 @@ func (l *keepAliveConn) SetKeepAlive(doKeepAlive bool) error { return l.TCPConn.SetKeepAlive(doKeepAlive) } +// SetKeepAlivePeriod sets keepalive period +func (l *keepAliveConn) SetKeepAlivePeriod(d time.Duration) error { + return l.TCPConn.SetKeepAlivePeriod(d) +} + // A tlsKeepaliveListener implements a network listener (net.Listener) for TLS connections. type tlsKeepaliveListener struct { net.Listener diff --git a/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_openbsd.go b/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_openbsd.go deleted file mode 100644 index 024c6c2363..0000000000 --- a/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_openbsd.go +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2023 The etcd Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//go:build openbsd - -package transport - -import "time" - -// SetKeepAlivePeriod sets keepalive period -func (l *keepAliveConn) SetKeepAlivePeriod(d time.Duration) error { - // OpenBSD has no user-settable per-socket TCP keepalive options. - // Refer to https://github.com/etcd-io/etcd/issues/15811. - return nil -} diff --git a/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_unix.go b/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_unix.go deleted file mode 100644 index 08061f7267..0000000000 --- a/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_unix.go +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 The etcd Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//go:build !openbsd - -package transport - -import "time" - -// SetKeepAlivePeriod sets keepalive period -func (l *keepAliveConn) SetKeepAlivePeriod(d time.Duration) error { - return l.TCPConn.SetKeepAlivePeriod(d) -} diff --git a/vendor/go.etcd.io/etcd/client/pkg/v3/types/urls.go b/vendor/go.etcd.io/etcd/client/pkg/v3/types/urls.go index 49a38967e6..9e5d03ff64 100644 --- a/vendor/go.etcd.io/etcd/client/pkg/v3/types/urls.go +++ b/vendor/go.etcd.io/etcd/client/pkg/v3/types/urls.go @@ -36,25 +36,20 @@ func NewURLs(strs []string) (URLs, error) { if err != nil { return nil, err } - - switch u.Scheme { - case "http", "https": - if _, _, err := net.SplitHostPort(u.Host); err != nil { - return nil, fmt.Errorf(`URL address does not have the form "host:port": %s`, in) - } - - if u.Path != "" { - return nil, fmt.Errorf("URL must not contain a path: %s", in) - } - case "unix", "unixs": - break - default: + if u.Scheme != "http" && u.Scheme != "https" && u.Scheme != "unix" && u.Scheme != "unixs" { return nil, fmt.Errorf("URL scheme must be http, https, unix, or unixs: %s", in) } + if _, _, err := net.SplitHostPort(u.Host); err != nil { + return nil, fmt.Errorf(`URL address does not have the form "host:port": %s`, in) + } + if u.Path != "" { + return nil, fmt.Errorf("URL must not contain a path: %s", in) + } all[i] = *u } us := URLs(all) us.Sort() + return us, nil } diff --git a/vendor/go.etcd.io/etcd/client/v3/client.go b/vendor/go.etcd.io/etcd/client/v3/client.go index 8a2225b227..efa44e8902 100644 --- a/vendor/go.etcd.io/etcd/client/v3/client.go +++ b/vendor/go.etcd.io/etcd/client/v3/client.go @@ -231,30 +231,15 @@ func (c *Client) dialSetupOpts(creds grpccredentials.TransportCredentials, dopts opts = append(opts, grpc.WithInsecure()) } - unaryMaxRetries := defaultUnaryMaxRetries - if c.cfg.MaxUnaryRetries > 0 { - unaryMaxRetries = c.cfg.MaxUnaryRetries - } - - backoffWaitBetween := defaultBackoffWaitBetween - if c.cfg.BackoffWaitBetween > 0 { - backoffWaitBetween = c.cfg.BackoffWaitBetween - } - - backoffJitterFraction := defaultBackoffJitterFraction - if c.cfg.BackoffJitterFraction > 0 { - backoffJitterFraction = c.cfg.BackoffJitterFraction - } - // Interceptor retry and backoff. // TODO: Replace all of clientv3/retry.go with RetryPolicy: // https://github.com/grpc/grpc-proto/blob/cdd9ed5c3d3f87aef62f373b93361cf7bddc620d/grpc/service_config/service_config.proto#L130 - rrBackoff := withBackoff(c.roundRobinQuorumBackoff(backoffWaitBetween, backoffJitterFraction)) + rrBackoff := withBackoff(c.roundRobinQuorumBackoff(defaultBackoffWaitBetween, defaultBackoffJitterFraction)) opts = append(opts, // Disable stream retry by default since go-grpc-middleware/retry does not support client streams. // Streams that are safe to retry are enabled individually. grpc.WithStreamInterceptor(c.streamClientInterceptor(withMax(0), rrBackoff)), - grpc.WithUnaryInterceptor(c.unaryClientInterceptor(withMax(unaryMaxRetries), rrBackoff)), + grpc.WithUnaryInterceptor(c.unaryClientInterceptor(withMax(defaultUnaryMaxRetries), rrBackoff)), ) return opts, nil diff --git a/vendor/go.etcd.io/etcd/client/v3/config.go b/vendor/go.etcd.io/etcd/client/v3/config.go index 6f5b41978d..335a288732 100644 --- a/vendor/go.etcd.io/etcd/client/v3/config.go +++ b/vendor/go.etcd.io/etcd/client/v3/config.go @@ -88,14 +88,5 @@ type Config struct { // PermitWithoutStream when set will allow client to send keepalive pings to server without any active streams(RPCs). PermitWithoutStream bool `json:"permit-without-stream"` - // MaxUnaryRetries is the maximum number of retries for unary RPCs. - MaxUnaryRetries uint `json:"max-unary-retries"` - - // BackoffWaitBetween is the wait time before retrying an RPC. - BackoffWaitBetween time.Duration `json:"backoff-wait-between"` - - // BackoffJitterFraction is the jitter fraction to randomize backoff wait time. - BackoffJitterFraction float64 `json:"backoff-jitter-fraction"` - // TODO: support custom balancer picker } diff --git a/vendor/modules.txt b/vendor/modules.txt index 147bc0e717..6cbc4b1ad7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -947,24 +947,24 @@ github.com/vmware/govmomi/vim25/xml # github.com/xlab/treeprint v1.1.0 ## explicit; go 1.13 github.com/xlab/treeprint -# go.etcd.io/etcd/api/v3 v3.5.13 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac -## explicit; go 1.21 +# go.etcd.io/etcd/api/v3 v3.5.13 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240520164943-5ed5044c5661 +## explicit; go 1.20 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb 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.13 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac -## explicit; go 1.21 +# go.etcd.io/etcd/client/pkg/v3 v3.5.13 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 +## explicit; go 1.20 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil 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.7 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac -## explicit; go 1.21 +# go.etcd.io/etcd/client/v3 v3.5.7 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240520164943-5ed5044c5661 +## explicit; go 1.20 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/credentials go.etcd.io/etcd/client/v3/internal/endpoint @@ -3293,7 +3293,7 @@ sigs.k8s.io/yaml # k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240516144826-048520e2550f # k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240516144826-048520e2550f # k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240516144826-048520e2550f -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240520164943-5ed5044c5661 +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240520164943-5ed5044c5661 # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20230724151845-8558e14a1168 From 7be52774e82f9545c6d180f0973359dcaccb82c5 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 28 May 2024 05:08:45 +0000 Subject: [PATCH 5/9] 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 31e5a278e4..2d5013eb7c 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -138,12 +138,12 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460 // from kubernetes - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd - go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd - go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd - go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240520164943-5ed5044c5661 // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240520164943-5ed5044c5661 // from etcd + go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 // from etcd + go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240520164943-5ed5044c5661 // from etcd + go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240520164943-5ed5044c5661 // from etcd k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240516144826-048520e2550f // staging kubernetes k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240516144826-048520e2550f // staging kubernetes k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240516144826-048520e2550f // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 6f26b3c6fc..ce4854f99c 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -284,18 +284,18 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= github.com/openshift/build-machinery-go v0.0.0-20230816154005-5a38e1bfd880 h1:FFRA5mTN0CwySUwJnerfX9oCpT3H2ply4sLhXwMubPY= github.com/openshift/build-machinery-go v0.0.0-20230816154005-5a38e1bfd880/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:U849p7TYPDOn10NOFUq2N4sQ/wmoFATuO+0I+QdYeoQ= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:QwsgXhxP1oarPmZ2PN/q64kJOGkH6ivRldlxiy5hmO8= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:l0SY5owduZwbAofIjNPmyJtbQ2dgFFmJ9ytvzeELRDI= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:cqiAeY8b5DEEcpxvgWKsbLIWNM/8Wy2xJSDMtioMcoI= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:Y9teTmp3d4+JP0N2kx+tlg+Rjucn+nMPcTTsm6dPEtc= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:N+4PLrp7agI/Viy+dUYpX7iRtSPvKq+w8Y14d1vX+m0= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:VJKb6GzR49RrpWlIK5KikFJblsOF9Y8HEQCMGvD3uIU= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:uUFibGLn2Ksm2URMxN1fICGhk8Wu96EfDQyuLhAcAmw= -github.com/openshift/etcd/server/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:r/WEOTzMIh8iJqAbRL6MNOPTSHXf2+s0ArJM27OGiRI= -github.com/openshift/etcd/server/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:K/8nbsGupHqmr5MkgaZpLlH1QdX1pcNQLAkODy44XcQ= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1:PhLpkbh8u9A13wRtRRY8Wdi/hSyJl1kPUhefR/HXV5k= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1:jek+dBXmSH2TRnkidLBMjpa8vWoIwGYZrxDxnX9ey+c= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1:CSoRU2XPMMRziq/pDD3H9pJA5ZJS+KkpaoRLzAxmvak= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1:F+CwzRywZ3GIekxW+9trXQtB09uhJECHZagblb5YWyk= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:UVwg/QIMoJncyeb/YxvJBJCE/NEwtHWashqc8A1nj/M= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1:6aC0BK4f4KqjicxhH+THYj/i8kKWwce1Uq6CWbCSO1I= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:ERQuZVe79PI6vcC3DlKBukDCLja/L7YMu29B74Iwj4U= +github.com/openshift/etcd/server/v3 v3.5.1-0.20240520164943-5ed5044c5661 h1:wIeFyS+hpjk/YD2TxKVeW5XqfoGix50aeNM+RnV6PoQ= +github.com/openshift/etcd/server/v3 v3.5.1-0.20240520164943-5ed5044c5661/go.mod h1:axB0oCjMy+cemo5290/CutIjoxlfA6KVYKD1w0uue10= github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240516144826-048520e2550f h1:hyjaS011I9fFO9R4bvGb0VRXxtSAW0L7RDa9/GQtnco= github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240516144826-048520e2550f/go.mod h1:oz3j0Ipoe5ZwwvfBCgxvcQTJKar/xDL5zSMKGSK6R9E= github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240516144826-048520e2550f h1:a85PH19P2jv1OpGb006SOWHlHCZ6BV75stZFrBh/uHc= From 9c343fa172aee3931a5fcb0f60184d1d674ce7ee Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 28 May 2024 05:08:50 +0000 Subject: [PATCH 6/9] update etcd/vendor --- .../go.etcd.io/etcd/api/v3/version/version.go | 2 +- .../pkg/v3/transport/keepalive_listener.go | 5 +++ .../transport/keepalive_listener_openbsd.go | 26 ----------- .../v3/transport/keepalive_listener_unix.go | 24 ---------- .../etcd/client/pkg/v3/types/urls.go | 21 ++++----- .../go.etcd.io/etcd/client/v3/client.go | 19 +------- .../go.etcd.io/etcd/client/v3/config.go | 9 ---- .../etcd/server/v3/embed/config_tracing.go | 2 +- .../go.etcd.io/etcd/server/v3/embed/etcd.go | 4 +- .../v3/etcdserver/api/etcdhttp/health.go | 2 +- .../server/v3/etcdserver/api/v3rpc/watch.go | 20 ++++++++- .../etcd/server/v3/etcdserver/server.go | 44 +------------------ .../etcd/server/v3/etcdserver/v3_server.go | 11 ----- .../go.etcd.io/etcd/server/v3/lease/lessor.go | 10 ++--- .../etcd/server/v3/mvcc/kvstore_compaction.go | 2 +- .../etcd/server/v3/mvcc/watchable_store.go | 5 --- etcd/vendor/modules.txt | 36 +++++++-------- 17 files changed, 62 insertions(+), 180 deletions(-) delete mode 100644 etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_openbsd.go delete mode 100644 etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_unix.go diff --git a/etcd/vendor/go.etcd.io/etcd/api/v3/version/version.go b/etcd/vendor/go.etcd.io/etcd/api/v3/version/version.go index d20b3a0202..4858a08bfe 100644 --- a/etcd/vendor/go.etcd.io/etcd/api/v3/version/version.go +++ b/etcd/vendor/go.etcd.io/etcd/api/v3/version/version.go @@ -26,7 +26,7 @@ import ( var ( // MinClusterVersion is the min cluster version this etcd binary is compatible with. MinClusterVersion = "3.0.0" - Version = "3.5.13" + Version = "3.5.12" APIVersion = "unknown" // Git SHA Value will be set during build diff --git a/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener.go b/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener.go index d00a93dc19..2241d8823e 100644 --- a/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener.go +++ b/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener.go @@ -87,6 +87,11 @@ func (l *keepAliveConn) SetKeepAlive(doKeepAlive bool) error { return l.TCPConn.SetKeepAlive(doKeepAlive) } +// SetKeepAlivePeriod sets keepalive period +func (l *keepAliveConn) SetKeepAlivePeriod(d time.Duration) error { + return l.TCPConn.SetKeepAlivePeriod(d) +} + // A tlsKeepaliveListener implements a network listener (net.Listener) for TLS connections. type tlsKeepaliveListener struct { net.Listener diff --git a/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_openbsd.go b/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_openbsd.go deleted file mode 100644 index 024c6c2363..0000000000 --- a/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_openbsd.go +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2023 The etcd Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//go:build openbsd - -package transport - -import "time" - -// SetKeepAlivePeriod sets keepalive period -func (l *keepAliveConn) SetKeepAlivePeriod(d time.Duration) error { - // OpenBSD has no user-settable per-socket TCP keepalive options. - // Refer to https://github.com/etcd-io/etcd/issues/15811. - return nil -} diff --git a/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_unix.go b/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_unix.go deleted file mode 100644 index 08061f7267..0000000000 --- a/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_unix.go +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 The etcd Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//go:build !openbsd - -package transport - -import "time" - -// SetKeepAlivePeriod sets keepalive period -func (l *keepAliveConn) SetKeepAlivePeriod(d time.Duration) error { - return l.TCPConn.SetKeepAlivePeriod(d) -} diff --git a/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/types/urls.go b/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/types/urls.go index 49a38967e6..9e5d03ff64 100644 --- a/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/types/urls.go +++ b/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/types/urls.go @@ -36,25 +36,20 @@ func NewURLs(strs []string) (URLs, error) { if err != nil { return nil, err } - - switch u.Scheme { - case "http", "https": - if _, _, err := net.SplitHostPort(u.Host); err != nil { - return nil, fmt.Errorf(`URL address does not have the form "host:port": %s`, in) - } - - if u.Path != "" { - return nil, fmt.Errorf("URL must not contain a path: %s", in) - } - case "unix", "unixs": - break - default: + if u.Scheme != "http" && u.Scheme != "https" && u.Scheme != "unix" && u.Scheme != "unixs" { return nil, fmt.Errorf("URL scheme must be http, https, unix, or unixs: %s", in) } + if _, _, err := net.SplitHostPort(u.Host); err != nil { + return nil, fmt.Errorf(`URL address does not have the form "host:port": %s`, in) + } + if u.Path != "" { + return nil, fmt.Errorf("URL must not contain a path: %s", in) + } all[i] = *u } us := URLs(all) us.Sort() + return us, nil } diff --git a/etcd/vendor/go.etcd.io/etcd/client/v3/client.go b/etcd/vendor/go.etcd.io/etcd/client/v3/client.go index 8a2225b227..efa44e8902 100644 --- a/etcd/vendor/go.etcd.io/etcd/client/v3/client.go +++ b/etcd/vendor/go.etcd.io/etcd/client/v3/client.go @@ -231,30 +231,15 @@ func (c *Client) dialSetupOpts(creds grpccredentials.TransportCredentials, dopts opts = append(opts, grpc.WithInsecure()) } - unaryMaxRetries := defaultUnaryMaxRetries - if c.cfg.MaxUnaryRetries > 0 { - unaryMaxRetries = c.cfg.MaxUnaryRetries - } - - backoffWaitBetween := defaultBackoffWaitBetween - if c.cfg.BackoffWaitBetween > 0 { - backoffWaitBetween = c.cfg.BackoffWaitBetween - } - - backoffJitterFraction := defaultBackoffJitterFraction - if c.cfg.BackoffJitterFraction > 0 { - backoffJitterFraction = c.cfg.BackoffJitterFraction - } - // Interceptor retry and backoff. // TODO: Replace all of clientv3/retry.go with RetryPolicy: // https://github.com/grpc/grpc-proto/blob/cdd9ed5c3d3f87aef62f373b93361cf7bddc620d/grpc/service_config/service_config.proto#L130 - rrBackoff := withBackoff(c.roundRobinQuorumBackoff(backoffWaitBetween, backoffJitterFraction)) + rrBackoff := withBackoff(c.roundRobinQuorumBackoff(defaultBackoffWaitBetween, defaultBackoffJitterFraction)) opts = append(opts, // Disable stream retry by default since go-grpc-middleware/retry does not support client streams. // Streams that are safe to retry are enabled individually. grpc.WithStreamInterceptor(c.streamClientInterceptor(withMax(0), rrBackoff)), - grpc.WithUnaryInterceptor(c.unaryClientInterceptor(withMax(unaryMaxRetries), rrBackoff)), + grpc.WithUnaryInterceptor(c.unaryClientInterceptor(withMax(defaultUnaryMaxRetries), rrBackoff)), ) return opts, nil diff --git a/etcd/vendor/go.etcd.io/etcd/client/v3/config.go b/etcd/vendor/go.etcd.io/etcd/client/v3/config.go index 6f5b41978d..335a288732 100644 --- a/etcd/vendor/go.etcd.io/etcd/client/v3/config.go +++ b/etcd/vendor/go.etcd.io/etcd/client/v3/config.go @@ -88,14 +88,5 @@ type Config struct { // PermitWithoutStream when set will allow client to send keepalive pings to server without any active streams(RPCs). PermitWithoutStream bool `json:"permit-without-stream"` - // MaxUnaryRetries is the maximum number of retries for unary RPCs. - MaxUnaryRetries uint `json:"max-unary-retries"` - - // BackoffWaitBetween is the wait time before retrying an RPC. - BackoffWaitBetween time.Duration `json:"backoff-wait-between"` - - // BackoffJitterFraction is the jitter fraction to randomize backoff wait time. - BackoffJitterFraction float64 `json:"backoff-jitter-fraction"` - // TODO: support custom balancer picker } diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/embed/config_tracing.go b/etcd/vendor/go.etcd.io/etcd/server/v3/embed/config_tracing.go index 382bc00e76..880479e515 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/embed/config_tracing.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/embed/config_tracing.go @@ -73,7 +73,7 @@ func newTracingExporter(ctx context.Context, cfg *Config) (*tracingExporter, err } } - traceProvider := tracesdk.NewTracerProvider( + traceProvider := tracesdk.NewTracerProvider( tracesdk.WithBatcher(exporter), tracesdk.WithResource(res), tracesdk.WithSampler( diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/embed/etcd.go b/etcd/vendor/go.etcd.io/etcd/server/v3/embed/etcd.go index 7176d56ab6..d514b1bfec 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/embed/etcd.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/embed/etcd.go @@ -624,10 +624,10 @@ func configureClientListeners(cfg *Config) (sctxs map[string]*serveCtx, err erro for _, u := range append(cfg.ListenClientUrls, cfg.ListenClientHttpUrls...) { if u.Scheme == "http" || u.Scheme == "unix" { if !cfg.ClientTLSInfo.Empty() { - cfg.logger.Warn("scheme is http or unix while key and cert files are present; ignoring key and cert files", zap.String("client-url", u.String())) + cfg.logger.Warn("scheme is HTTP while key and cert files are present; ignoring key and cert files", zap.String("client-url", u.String())) } if cfg.ClientTLSInfo.ClientCertAuth { - cfg.logger.Warn("scheme is http or unix while --client-cert-auth is enabled; ignoring client cert auth for this URL", zap.String("client-url", u.String())) + cfg.logger.Warn("scheme is HTTP while --client-cert-auth is enabled; ignoring client cert auth for this URL", zap.String("client-url", u.String())) } } if (u.Scheme == "https" || u.Scheme == "unixs") && cfg.ClientTLSInfo.Empty() { diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp/health.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp/health.go index 15655e580c..0a93342912 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp/health.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp/health.go @@ -60,7 +60,7 @@ type serverHealthV2V3 interface { Leader() types.ID } -// HandleHealthForV2 registers metrics and health handlers for v2. +// HandleHealth registers metrics and health handlers for v2. func HandleHealthForV2(lg *zap.Logger, mux *http.ServeMux, srv etcdserver.ServerV2) { mux.Handle(PathHealth, NewHealthHandler(lg, func(ctx context.Context, excludedAlarms StringSet, serializable bool) Health { if h := checkAlarms(lg, srv, excludedAlarms); h.Health != "true" { diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/watch.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/watch.go index ddbcd231bf..cd834aa3e8 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/watch.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/watch.go @@ -144,6 +144,10 @@ type serverWatchStream struct { // records fragmented watch IDs fragment map[mvcc.WatchID]bool + // indicates whether we have an outstanding global progress + // notification to send + deferredProgress bool + // closec indicates the stream is closed. closec chan struct{} @@ -173,6 +177,8 @@ func (ws *watchServer) Watch(stream pb.Watch_WatchServer) (err error) { prevKV: make(map[mvcc.WatchID]bool), fragment: make(map[mvcc.WatchID]bool), + deferredProgress: false, + closec: make(chan struct{}), } @@ -360,7 +366,14 @@ func (sws *serverWatchStream) recvLoop() error { case *pb.WatchRequest_ProgressRequest: if uv.ProgressRequest != nil { sws.mu.Lock() - sws.watchStream.RequestProgressAll() + // Ignore if deferred progress notification is already in progress + if !sws.deferredProgress { + // Request progress for all watchers, + // force generation of a response + if !sws.watchStream.RequestProgressAll() { + sws.deferredProgress = true + } + } sws.mu.Unlock() } default: @@ -468,6 +481,11 @@ func (sws *serverWatchStream) sendLoop() { // elide next progress update if sent a key update sws.progress[wresp.WatchID] = false } + if sws.deferredProgress { + if sws.watchStream.RequestProgressAll() { + sws.deferredProgress = false + } + } sws.mu.Unlock() case c, ok := <-sws.ctrlStream: diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go index aca92dd8e4..0095b6ec5c 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go @@ -669,15 +669,8 @@ func NewServer(cfg config.ServerConfig) (srv *EtcdServer, err error) { if srv.Cfg.EnableLeaseCheckpoint { // setting checkpointer enables lease checkpoint feature. - srv.lessor.SetCheckpointer(func(ctx context.Context, cp *pb.LeaseCheckpointRequest) error { - if !srv.ensureLeadership() { - srv.lg.Warn("Ignore the checkpoint request because current member isn't a leader", - zap.Uint64("local-member-id", uint64(srv.ID()))) - return lease.ErrNotPrimary - } - + srv.lessor.SetCheckpointer(func(ctx context.Context, cp *pb.LeaseCheckpointRequest) { srv.raftRequestOnce(ctx, pb.InternalRaftRequest{LeaseCheckpoint: cp}) - return nil }) } @@ -1161,19 +1154,7 @@ func (s *EtcdServer) run() { func (s *EtcdServer) revokeExpiredLeases(leases []*lease.Lease) { s.GoAttach(func() { - // We shouldn't revoke any leases if current member isn't a leader, - // because the operation should only be performed by the leader. When - // the leader gets blocked on the raft loop, such as writing WAL entries, - // it can't process any events or messages from raft. It may think it - // is still the leader even the leader has already changed. - // Refer to https://github.com/etcd-io/etcd/issues/15247 lg := s.Logger() - if !s.ensureLeadership() { - lg.Warn("Ignore the lease revoking request because current member isn't a leader", - zap.Uint64("local-member-id", uint64(s.ID()))) - return - } - // Increases throughput of expired leases deletion process through parallelization c := make(chan struct{}, maxPendingRevokes) for _, curLease := range leases { @@ -1206,29 +1187,6 @@ func (s *EtcdServer) revokeExpiredLeases(leases []*lease.Lease) { }) } -// ensureLeadership checks whether current member is still the leader. -func (s *EtcdServer) ensureLeadership() bool { - lg := s.Logger() - - ctx, cancel := context.WithTimeout(s.ctx, s.Cfg.ReqTimeout()) - defer cancel() - if err := s.linearizableReadNotify(ctx); err != nil { - lg.Warn("Failed to check current member's leadership", - zap.Error(err)) - return false - } - - newLeaderId := s.raftStatus().Lead - if newLeaderId != uint64(s.ID()) { - lg.Warn("Current member isn't a leader", - zap.Uint64("local-member-id", uint64(s.ID())), - zap.Uint64("new-lead", newLeaderId)) - return false - } - - return true -} - // Cleanup removes allocated objects by EtcdServer.NewServer in // situation that EtcdServer::Start was not called (that takes care of cleanup). func (s *EtcdServer) Cleanup() { diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/v3_server.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/v3_server.go index b6e7a80679..9f69b86b9b 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/v3_server.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/v3_server.go @@ -297,17 +297,6 @@ func (s *EtcdServer) LeaseRevoke(ctx context.Context, r *pb.LeaseRevokeRequest) func (s *EtcdServer) LeaseRenew(ctx context.Context, id lease.LeaseID) (int64, error) { if s.isLeader() { - // If s.isLeader() returns true, but we fail to ensure the current - // member's leadership, there are a couple of possibilities: - // 1. current member gets stuck on writing WAL entries; - // 2. current member is in network isolation status; - // 3. current member isn't a leader anymore (possibly due to #1 above). - // In such case, we just return error to client, so that the client can - // switch to another member to continue the lease keep-alive operation. - if !s.ensureLeadership() { - return -1, lease.ErrNotPrimary - } - if err := s.waitAppliedIndex(); err != nil { return 0, err } diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/lease/lessor.go b/etcd/vendor/go.etcd.io/etcd/server/v3/lease/lessor.go index abeeb09bf4..ff9cb2ca5e 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/lease/lessor.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/lease/lessor.go @@ -77,7 +77,7 @@ type RangeDeleter func() TxnDelete // Checkpointer permits checkpointing of lease remaining TTLs to the consensus log. Defined here to // avoid circular dependency with mvcc. -type Checkpointer func(ctx context.Context, lc *pb.LeaseCheckpointRequest) error +type Checkpointer func(ctx context.Context, lc *pb.LeaseCheckpointRequest) type LeaseID int64 @@ -423,9 +423,7 @@ func (le *lessor) Renew(id LeaseID) (int64, error) { // By applying a RAFT entry only when the remainingTTL is already set, we limit the number // of RAFT entries written per lease to a max of 2 per checkpoint interval. if clearRemainingTTL { - if err := le.cp(context.Background(), &pb.LeaseCheckpointRequest{Checkpoints: []*pb.LeaseCheckpoint{{ID: int64(l.ID), Remaining_TTL: 0}}}); err != nil { - return -1, err - } + le.cp(context.Background(), &pb.LeaseCheckpointRequest{Checkpoints: []*pb.LeaseCheckpoint{{ID: int64(l.ID), Remaining_TTL: 0}}}) } le.mu.Lock() @@ -661,9 +659,7 @@ func (le *lessor) checkpointScheduledLeases() { le.mu.Unlock() if len(cps) != 0 { - if err := le.cp(context.Background(), &pb.LeaseCheckpointRequest{Checkpoints: cps}); err != nil { - return - } + le.cp(context.Background(), &pb.LeaseCheckpointRequest{Checkpoints: cps}) } if len(cps) < maxLeaseCheckpointBatchSize { return 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 c7d343d5c3..393f9d5661 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 @@ -19,8 +19,8 @@ import ( "fmt" "time" - humanize "github.com/dustin/go-humanize" "go.etcd.io/etcd/server/v3/mvcc/buckets" + humanize "github.com/dustin/go-humanize" "go.uber.org/zap" ) diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/watchable_store.go b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/watchable_store.go index cdac20ad5e..85429e850a 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/watchable_store.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/watchable_store.go @@ -366,11 +366,6 @@ func (s *watchableStore) syncWatchers() int { var victims watcherBatch wb := newWatcherBatch(wg, evs) for w := range wg.watchers { - if w.minRev < compactionRev { - // Skip the watcher that failed to send compacted watch response due to w.ch is full. - // Next retry of syncWatchers would try to resend the compacted watch response to w.ch - continue - } w.minRev = curRev + 1 eb, ok := wb[w] diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index f8a833e1b3..0e20111211 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -253,8 +253,8 @@ github.com/xlab/treeprint # go.etcd.io/bbolt v1.3.9 ## explicit; go 1.17 go.etcd.io/bbolt -# go.etcd.io/etcd/api/v3 v3.5.13 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac -## explicit; go 1.21 +# go.etcd.io/etcd/api/v3 v3.5.13 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240520164943-5ed5044c5661 +## explicit; go 1.20 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb go.etcd.io/etcd/api/v3/etcdserverpb/gw @@ -262,8 +262,8 @@ 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.13 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac -## explicit; go 1.21 +# go.etcd.io/etcd/client/pkg/v3 v3.5.13 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 +## explicit; go 1.20 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil go.etcd.io/etcd/client/pkg/v3/pathutil @@ -275,15 +275,15 @@ go.etcd.io/etcd/client/pkg/v3/types # go.etcd.io/etcd/client/v2 v2.305.13 ## explicit; go 1.21 go.etcd.io/etcd/client/v2 -# go.etcd.io/etcd/client/v3 v3.5.13 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac -## explicit; go 1.21 +# go.etcd.io/etcd/client/v3 v3.5.13 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240520164943-5ed5044c5661 +## explicit; go 1.20 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.13 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac -## explicit; go 1.21 +# go.etcd.io/etcd/pkg/v3 v3.5.13 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 +## explicit; go 1.20 go.etcd.io/etcd/pkg/v3/adt go.etcd.io/etcd/pkg/v3/contention go.etcd.io/etcd/pkg/v3/cpuutil @@ -299,15 +299,15 @@ 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.13 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240417093127-b0c0321e61ac -## explicit; go 1.21 +# go.etcd.io/etcd/raft/v3 v3.5.13 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240520164943-5ed5044c5661 +## explicit; go 1.20 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.7 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240417093127-b0c0321e61ac -## explicit; go 1.21 +# go.etcd.io/etcd/server/v3 v3.5.7 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240520164943-5ed5044c5661 +## explicit; go 1.20 go.etcd.io/etcd/server/v3/auth go.etcd.io/etcd/server/v3/config go.etcd.io/etcd/server/v3/datadir @@ -1013,12 +1013,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.20230317131656-c62d9de5a460 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac -# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac -# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240417093127-b0c0321e61ac -# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240417093127-b0c0321e61ac +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240520164943-5ed5044c5661 +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240520164943-5ed5044c5661 +# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240520164943-5ed5044c5661 +# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240520164943-5ed5044c5661 +# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240520164943-5ed5044c5661 # k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240516144826-048520e2550f # k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240516144826-048520e2550f # k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240516144826-048520e2550f From 05595e78513c31a35648bf9ee9662c5708509bad Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 28 May 2024 05:08:51 +0000 Subject: [PATCH 7/9] update component images --- packaging/crio.conf.d/microshift_amd64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crio.conf.d/microshift_amd64.conf b/packaging/crio.conf.d/microshift_amd64.conf index 7d810ff310..c7e695e7af 100644 --- a/packaging/crio.conf.d/microshift_amd64.conf +++ b/packaging/crio.conf.d/microshift_amd64.conf @@ -25,6 +25,6 @@ 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:0f6ec1e4ec9138491cd9c6b49038c49eabc1e9116a25e5be6ddc709a36339383" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88a7db8489abe78636d4452283c35b2e62fc38f2d6e09c8eba96687c2856db61" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From b1174cf0e0731435882eef7a136f88f1a23d3e3f Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 28 May 2024 05:08:53 +0000 Subject: [PATCH 8/9] update manifests --- .../kube-apiserver/config-overrides.yaml | 1 - assets/release/release-aarch64.json | 4 ++-- assets/release/release-x86_64.json | 22 +++++++++---------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/assets/controllers/kube-apiserver/config-overrides.yaml b/assets/controllers/kube-apiserver/config-overrides.yaml index 7edbffecd5..ac1b81ad24 100644 --- a/assets/controllers/kube-apiserver/config-overrides.yaml +++ b/assets/controllers/kube-apiserver/config-overrides.yaml @@ -17,4 +17,3 @@ serviceAccountPublicKeyFiles: # The following path contains the public keys needed to verify bound sa # tokens. This is only supported post-bootstrap. - /etc/kubernetes/static-pod-resources/configmaps/bound-sa-token-signing-certs - diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 7eb38abeff..3e41860e01 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.14.0-0.nightly-arm64-2024-05-23-123237" + "base": "4.14.0-0.nightly-arm64-2024-05-27-120012" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d15ba16c99c08fe49b742c96ded19f3934294bca592418b835bff30bfcebf77", @@ -8,7 +8,7 @@ "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:218ae78b9685532708bc26c0cf58455b8ab8d1f1238ba9965e763a76c59b511e", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:54af87eb207b7f05def68326cdb7f4e03ba766312b60e6e41a433beb5c84de37", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd31fee892859c2f92004de16416718714bdf677fdd5d52cda32d42e5a6388e6", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5facccdc49ae11c0af28284f45c9651b46a00324526d827f8ea413dd2abd4ada", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:388de64014904e813d96448466356224e448d3278786dbee971545dbda9d9842", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b4477fce03efd3ab3220f53e5668a115e72aca29757c2f87a56965994b5c697", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 8adc361261..8ef8d500fa 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.14.0-0.nightly-2024-05-20-155905" + "base": "4.14.0-0.nightly-2024-05-27-130305" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00e364011c67e7498c7ba0ee769c97b24e43b0b3863ec39860ea05fb7c15c279", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0c6e2b7672e5d959a506baa803e18e6c0d73fdfe7534ae28c61f69583e5e5ec", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f699172cd627b0babbc67878fd78883648a1f8bd9c82441e875b67a9c8f5b71a", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41cf2f6ddbe07a2356bada1196f1f09804bc2ff8b5b588117190ef4e8028f8b2", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3dd75913ad28f9fbe073aa6b4a4395d983576cb6baa3b951c45a80b721bbc0b", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60eaf6b3d575c07ae9cd6326a7effc11bfd56eeec96b6b8cd1323a87fda6f046", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa37b136a21c7da46402000688540a2c70edc89d386b11e5268f84b0f4cbff1c", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:600c03493940c25ae3381c9a6ffb7f18f67e1601ba20302e460cc4a1ef132216", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33745f0814b401a1dfd89ba9bdf374e52521f175d0578cab4900afbd70eff3cb", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f6ec1e4ec9138491cd9c6b49038c49eabc1e9116a25e5be6ddc709a36339383", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01c9e7fffa1e6c0cc6b1ded0f8c381ac00a6f34699f1281ac477657717806fe6", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9483c0424146fbdf92a73c2ce7ad1163410b570e3e7f76550b6d7cc18d5ab57e", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88a7db8489abe78636d4452283c35b2e62fc38f2d6e09c8eba96687c2856db61", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53cdb9dbbc53a93861f725ea08a2c8574cdd8e9ff3e7dfd843877758dc571263", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:caa0bbab808d8cbed476e8fa3e296ceb90f8d7d253e36588fa77e639ea389d55", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:829a8e4d34404abbd22fddb6ebfa0f74daa55f2697fb147da77b83fc8b473d8c", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:7ee0257998b7f804fcde9c095b4dc240c510eb316d7223e8485f701b5c9f2fbf", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:b453a5c76ba4e975a978e31a51531b1d6233723b0d944622caf7844dedf9ad5a", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1ac24a4cc03b5c7fa8c6be5f4de9c9fdc946ddb302f0c028264bcfeea097fbf9", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9b20f6fdc6a4c62300eabbf967ed798ca6a3f5d43a067df4774ec76c5b038656", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:43b98f22d7383fbd10fcbf271c1a55f5ce90a7e89b5ffe390458cc772ce5a4a9" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3510003c5ebcb28be2825641599617e04170998090878fa62ed07661ba3dc63", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:409f60bdf11430c0b34def19129fe6cc0f1402fbd25a800ad0c9276abfd82871", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc9de32fa8db9a7025f651fc607427f226b78526beda1c385e60270a8b941a3d" } } From a606a01f68dac4d7ca792f3a02ba7a4d3e3c045f Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 28 May 2024 05:09:00 +0000 Subject: [PATCH 9/9] 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 b40291962b..215a6247db 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-arm64-2024-05-23-123237 +OCP_VERSION := 4.14.0-0.nightly-arm64-2024-05-27-120012 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index b5b94eb7c6..08a81b019d 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-2024-05-20-155905 +OCP_VERSION := 4.14.0-0.nightly-2024-05-27-130305