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

lint

Browse Source 
Signed-off-by: Omer Aplatony <omerap12@gmail.com>
This commit is contained in:
Omer Aplatony 2024-11-12 13:45:26 +02:00
parent 991651353d
commit 8b90c9e885
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go
View File

@ -316,7 +316,7 @@ func (c *DiscoveryController) Run(stopCh <-chan struct{}, synchedCh chan<- struc
} }
return true, nil return true, nil
}); err != nil { }); err != nil {
if errors.Is(err, context.Canceled) { if errors.Is(err, context.DeadlineExceeded) {
utilruntime.HandleError(fmt.Errorf("timed out waiting for initial discovery sync")) utilruntime.HandleError(fmt.Errorf("timed out waiting for initial discovery sync"))
return return
} }

3
staging/src/k8s.io/apiextensions-apiserver/test/integration/validation_test.go
View File

@ -18,6 +18,7 @@ package integration
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"strings" "strings"
"testing" "testing"
@ -1540,7 +1541,7 @@ properties:
} }
return true, nil return true, nil
}) })
if err != context.DeadlineExceeded { if !errors.Is(err, context.DeadlineExceeded) {
t.Fatalf("expected no NonStructuralSchema condition, but got one: %v", cond) t.Fatalf("expected no NonStructuralSchema condition, but got one: %v", cond)
} }
return return