github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Flatten switch case

Browse Source
This commit is contained in:
Marek Siarkowicz 2023-08-30 16:42:34 +02:00
parent 1f4f2a5d60
commit 10553a1966
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -678,22 +678,6 @@ func (s *store) GetList(ctx context.Context, key string, opts storage.ListOption
if continueRV > 0 { if continueRV > 0 {
withRev = continueRV withRev = continueRV
} }
case recursive && s.pagingEnabled && pred.Limit > 0:
if fromRV != nil {
switch match {
case metav1.ResourceVersionMatchNotOlderThan:
// The not older than constraint is checked after we get a response from etcd,
// and returnedRV is then set to the revision we get from the etcd response.
case metav1.ResourceVersionMatchExact:
withRev = int64(*fromRV)
case "": // legacy case
if *fromRV > 0 {
withRev = int64(*fromRV)
}
default:
return fmt.Errorf("unknown ResourceVersionMatch value: %v", match)
}
}
default: default:
if fromRV != nil { if fromRV != nil {
switch match { switch match {
@ -703,6 +687,9 @@ func (s *store) GetList(ctx context.Context, key string, opts storage.ListOption
case metav1.ResourceVersionMatchExact: case metav1.ResourceVersionMatchExact:
withRev = int64(*fromRV) withRev = int64(*fromRV)
case "": // legacy case case "": // legacy case
if recursive && s.pagingEnabled && pred.Limit > 0 && *fromRV > 0 {
withRev = int64(*fromRV)
}
default: default:
return fmt.Errorf("unknown ResourceVersionMatch value: %v", match) return fmt.Errorf("unknown ResourceVersionMatch value: %v", match)
} }