github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Migrate Get to Kubernetes client

Browse Source
This commit is contained in:
Marek Siarkowicz 2024-05-31 10:54:49 +02:00
parent 066c1c05d7
commit 092a6d1e0d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go
View File

@ -161,29 +161,28 @@ func (s *store) Get(ctx context.Context, key string, opts storage.GetOptions, ou
return err return err
} }
startTime := time.Now() startTime := time.Now()
getResp, err := s.client.KV.Get(ctx, preparedKey) getResp, err := s.client.Kubernetes.Get(ctx, preparedKey, kubernetes.GetOptions{})
metrics.RecordEtcdRequest("get", s.groupResourceString, err, startTime) metrics.RecordEtcdRequest("get", s.groupResourceString, err, startTime)
if err != nil { if err != nil {
return err return err
} }
if err = s.validateMinimumResourceVersion(opts.ResourceVersion, uint64(getResp.Header.Revision)); err != nil { if err = s.validateMinimumResourceVersion(opts.ResourceVersion, uint64(getResp.Revision)); err != nil {
return err return err
} }
if len(getResp.Kvs) == 0 { if getResp.KV == nil {
if opts.IgnoreNotFound { if opts.IgnoreNotFound {
return runtime.SetZeroValue(out) return runtime.SetZeroValue(out)
} }
return storage.NewKeyNotFoundError(preparedKey, 0) return storage.NewKeyNotFoundError(preparedKey, 0)
} }
kv := getResp.Kvs[0]
data, _, err := s.transformer.TransformFromStorage(ctx, kv.Value, authenticatedDataString(preparedKey)) data, _, err := s.transformer.TransformFromStorage(ctx, getResp.KV.Value, authenticatedDataString(preparedKey))
if err != nil { if err != nil {
return storage.NewInternalError(err) return storage.NewInternalError(err)
} }
err = s.decoder.Decode(data, out, kv.ModRevision) err = s.decoder.Decode(data, out, getResp.KV.ModRevision)
if err != nil { if err != nil {
recordDecodeError(s.groupResourceString, preparedKey) recordDecodeError(s.groupResourceString, preparedKey)
return err return err