Migrate Count to Kubernetes client

serathius · serathius · commit e192ac31a425 · 2024-10-24T10:23:54.000+02:00
diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go
@@ -573,12 +573,12 @@ func (s *store) Count(key string) (int64, error) {
 	}
 
 	startTime := time.Now()
-	getResp, err := s.client.KV.Get(context.Background(), preparedKey, clientv3.WithRange(clientv3.GetPrefixRangeEnd(preparedKey)), clientv3.WithCountOnly())
+	count, err := s.client.Kubernetes.Count(context.Background(), preparedKey, kubernetes.CountOptions{})
 	metrics.RecordEtcdRequest("listWithCount", preparedKey, err, startTime)
 	if err != nil {
 		return 0, err
 	}
-	return getResp.Count, nil
+	return count, nil
 }
 
 // ReadinessCheck implements storage.Interface.

Original file line number	Diff line number	Diff line change
`@@ -573,12 +573,12 @@ func (s *store) Count(key string) (int64, error) {`
`573`	`573`	`}`
`574`	`574`
`575`	`575`	`startTime := time.Now()`
`576`		`- getResp, err := s.client.KV.Get(context.Background(), preparedKey, clientv3.WithRange(clientv3.GetPrefixRangeEnd(preparedKey)), clientv3.WithCountOnly())`
	`576`	`+ count, err := s.client.Kubernetes.Count(context.Background(), preparedKey, kubernetes.CountOptions{})`
`577`	`577`	`metrics.RecordEtcdRequest("listWithCount", preparedKey, err, startTime)`
`578`	`578`	`if err != nil {`
`579`	`579`	`return 0, err`
`580`	`580`	`}`
`581`		`- return getResp.Count, nil`
	`581`	`+ return count, nil`
`582`	`582`	`}`
`583`	`583`
`584`	`584`	`// ReadinessCheck implements storage.Interface.`