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

fix flaky admission tests

Browse Source 
would fllake .04% of the time on my machine.

In tests waiting for objects to be reconciled, would erroneously treat the "Not Found" case as an error rather than waiting a bit.

also add some more context to test errors to improve debuggability
This commit is contained in:
Alexander Zielenski 2022-10-21 09:47:18 -07:00
parent 4d50d28777
commit bfbc1f3479
No known key found for this signature in database
GPG Key ID: 754BC11B447F7843
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/admission_test.go
View File

@ -141,6 +141,8 @@ func setupTest(t *testing.T) (plugin admission.ValidationInterface, paramTracker
// Gets the last reconciled value in the controller of an object with the same // Gets the last reconciled value in the controller of an object with the same
// gvk and name as the given object // gvk and name as the given object
//
// If the object is not found both the error and object will be nil.
func (c *celAdmissionController) getCurrentObject(obj runtime.Object) (runtime.Object, error) { func (c *celAdmissionController) getCurrentObject(obj runtime.Object) (runtime.Object, error) {
accessor, err := meta.Accessor(obj) accessor, err := meta.Accessor(obj)
if err != nil { if err != nil {
@ -157,7 +159,8 @@ func (c *celAdmissionController) getCurrentObject(obj runtime.Object) (runtime.O
if paramInfo, ok := c.paramsCRDControllers[paramSource]; ok { if paramInfo, ok := c.paramsCRDControllers[paramSource]; ok {
paramInformer = paramInfo.controller.Informer() paramInformer = paramInfo.controller.Informer()
} else { } else {
return nil, fmt.Errorf("paramSource kind `%v` not known", paramSource.String()) // Treat unknown CRD the same as not found
return nil, nil
} }
// Param type. Just check informer for its GVK // Param type. Just check informer for its GVK
@ -198,16 +201,19 @@ func waitForReconcile(ctx context.Context, controller *celAdmissionController, o
for _, obj := range objects { for _, obj := range objects {
currentValue, err := controller.getCurrentObject(obj) currentValue, err := controller.getCurrentObject(obj)
if err != nil { if err != nil {
return false, err return false, fmt.Errorf("error getting current object: %w", err)
} else if currentValue == nil {
// Object not found, but not an error. Keep waiting.
return false, nil
} }
objMeta, err := meta.Accessor(obj) objMeta, err := meta.Accessor(obj)
if err != nil { if err != nil {
return false, err return false, fmt.Errorf("error getting meta accessor for original %T object (%v): %w", obj, obj, err)
} }
valueMeta, err := meta.Accessor(currentValue) valueMeta, err := meta.Accessor(currentValue)
if err != nil { if err != nil {
return false, err return false, fmt.Errorf("error getting meta accessor for current %T object (%v): %w", currentValue, currentValue, err)
} }
if len(objMeta.GetResourceVersion()) == 0 { if len(objMeta.GetResourceVersion()) == 0 {