From 33d1d2e6561ce5d3e40f48ede564dcced019266e Mon Sep 17 00:00:00 2001 From: Jefftree Date: Fri, 5 Jun 2026 11:07:21 -0400 Subject: [PATCH] apiserver: inline isUnimplementedErr and clarify sync fallback flow --- .../src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go index dbfe556f334..c1c62d4e1fd 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go @@ -234,10 +234,6 @@ type grpcError interface { GRPCStatus() *grpcstatus.Status } -func isUnimplementedErr(err error) bool { - return grpcstatus.Code(err) == grpccodes.Unimplemented -} - func isCancelError(err error) bool { if err == nil { return false @@ -298,7 +294,10 @@ func (wc *watchChan) sync() error { // TODO(jefftree): detect RangeStream support via the etcd feature checker. if wc.recursive && utilfeature.DefaultFeatureGate.Enabled(features.EtcdRangeStream) { err := wc.syncStreamRecursive() - if !isUnimplementedErr(err) { + if err == nil { + return nil + } + if grpcstatus.Code(err) != grpccodes.Unimplemented { return err } klog.V(4).Infof("etcd server does not support RangeStream for %v; falling back to paginated list", wc.watcher.groupResource)