github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #113264 from alexzielenski/admission-flake-fix

Browse Source 
fix flaky admission tests
This commit is contained in:
Kubernetes Prow Robot 2022-10-21 12:37:50 -07:00 committed by GitHub
commit 21335cc264
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
// 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) {
accessor, err := meta.Accessor(obj)
if err != nil {
@ -157,7 +159,8 @@ func (c *celAdmissionController) getCurrentObject(obj runtime.Object) (runtime.O
if paramInfo, ok := c.paramsCRDControllers[paramSource]; ok {
paramInformer = paramInfo.controller.Informer()
} 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
@ -198,16 +201,19 @@ func waitForReconcile(ctx context.Context, controller *celAdmissionController, o
for _, obj := range objects {
currentValue, err := controller.getCurrentObject(obj)
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)
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)
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 {