From 4e6aafb9b3451ddf4dadbc6838e58c6a1463f972 Mon Sep 17 00:00:00 2001 From: Lalit Chauhan Date: Tue, 6 Jan 2026 18:38:35 +0000 Subject: [PATCH] Address feedbacks --- pkg/api/testing/validation.go | 3 ++- pkg/api/testing/validation_test.go | 4 +++- .../src/k8s.io/apimachinery/pkg/runtime/testing/validation.go | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/api/testing/validation.go b/pkg/api/testing/validation.go index 49f4eab260b..7940afa72eb 100644 --- a/pkg/api/testing/validation.go +++ b/pkg/api/testing/validation.go @@ -202,7 +202,8 @@ type validationOption struct { // NormalizationRules are the rules to apply to field paths before comparison. NormalizationRules []field.NormalizationRule - // IgnoreObjectConversions skips the tests if the conversion between object fails. + // IgnoreObjectConversions skips the tests if the conversion from the internal object + // to the versioned object fails. IgnoreObjectConversionErrors bool } diff --git a/pkg/api/testing/validation_test.go b/pkg/api/testing/validation_test.go index d79f13fff79..89154a58e5a 100644 --- a/pkg/api/testing/validation_test.go +++ b/pkg/api/testing/validation_test.go @@ -74,7 +74,9 @@ func TestVersionedValidationByFuzzing(t *testing.T) { allRules := append([]field.NormalizationRule{}, resourcevalidation.ResourceNormalizationRules...) allRules = append(allRules, nodevalidation.NodeNormalizationRules...) opts = append(opts, WithNormalizationRules(allRules...)) - opts = append(opts, WithIgnoreObjectConversionErrors()) + if gv.Group == "autoscaling" { + opts = append(opts, WithIgnoreObjectConversionErrors()) + } VerifyVersionedValidationEquivalence(t, obj, nil, opts...) diff --git a/staging/src/k8s.io/apimachinery/pkg/runtime/testing/validation.go b/staging/src/k8s.io/apimachinery/pkg/runtime/testing/validation.go index 2520cc7f4a4..f320ce229eb 100644 --- a/staging/src/k8s.io/apimachinery/pkg/runtime/testing/validation.go +++ b/staging/src/k8s.io/apimachinery/pkg/runtime/testing/validation.go @@ -98,7 +98,7 @@ func runUpdateValidation(t *testing.T, scheme *runtime.Scheme, options []string, t.Fatal(err) } err = scheme.Convert(unversionedNew, versionedNew, nil) - if err != nil && ignoreConversionErrors { + if ignoreConversionErrors && err != nil { t.Skipf("Failed to convert object from internal type to %s: %v", gvk.Version, err) } else if err != nil { t.Fatal(err) @@ -111,7 +111,7 @@ func runUpdateValidation(t *testing.T, scheme *runtime.Scheme, options []string, } err = scheme.Convert(unversionedOld, versionedOld, nil) - if err != nil && ignoreConversionErrors { + if ignoreConversionErrors && err != nil { t.Skipf("Failed to convert object from internal type to %s: %v", gvk.Version, err) } else if err != nil { t.Fatal(err)