Skip to content

Commit 092a6d1

Browse files
committed
Migrate Get to Kubernetes client
1 parent 066c1c0 commit 092a6d1

File tree

1 file changed

+5
-6
lines changed
  • staging/src/k8s.io/apiserver/pkg/storage/etcd3

1 file changed

+5
-6
lines changed

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,29 +161,28 @@ func (s *store) Get(ctx context.Context, key string, opts storage.GetOptions, ou
161161
return err
162162
}
163163
startTime := time.Now()
164-
getResp, err := s.client.KV.Get(ctx, preparedKey)
164+
getResp, err := s.client.Kubernetes.Get(ctx, preparedKey, kubernetes.GetOptions{})
165165
metrics.RecordEtcdRequest("get", s.groupResourceString, err, startTime)
166166
if err != nil {
167167
return err
168168
}
169-
if err = s.validateMinimumResourceVersion(opts.ResourceVersion, uint64(getResp.Header.Revision)); err != nil {
169+
if err = s.validateMinimumResourceVersion(opts.ResourceVersion, uint64(getResp.Revision)); err != nil {
170170
return err
171171
}
172172

173-
if len(getResp.Kvs) == 0 {
173+
if getResp.KV == nil {
174174
if opts.IgnoreNotFound {
175175
return runtime.SetZeroValue(out)
176176
}
177177
return storage.NewKeyNotFoundError(preparedKey, 0)
178178
}
179-
kv := getResp.Kvs[0]
180179

181-
data, _, err := s.transformer.TransformFromStorage(ctx, kv.Value, authenticatedDataString(preparedKey))
180+
data, _, err := s.transformer.TransformFromStorage(ctx, getResp.KV.Value, authenticatedDataString(preparedKey))
182181
if err != nil {
183182
return storage.NewInternalError(err)
184183
}
185184

186-
err = s.decoder.Decode(data, out, kv.ModRevision)
185+
err = s.decoder.Decode(data, out, getResp.KV.ModRevision)
187186
if err != nil {
188187
recordDecodeError(s.groupResourceString, preparedKey)
189188
return err

0 commit comments

Comments
 (0)