From 1ef469343f0a61687c784be1c89f39c833a7a9b8 Mon Sep 17 00:00:00 2001 From: Yuki Iwai Date: Thu, 8 Feb 2024 08:02:00 +0900 Subject: [PATCH] Job: Use generic sets to avoid unnecessary string casts in valiations Signed-off-by: Yuki Iwai --- pkg/apis/batch/validation/validation.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/apis/batch/validation/validation.go b/pkg/apis/batch/validation/validation.go index e8c22ba7be6..79704ef4605 100644 --- a/pkg/apis/batch/validation/validation.go +++ b/pkg/apis/batch/validation/validation.go @@ -28,6 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" unversionedvalidation "k8s.io/apimachinery/pkg/apis/meta/v1/validation" "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" apimachineryvalidation "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" @@ -402,25 +403,25 @@ func validateJobStatus(status *batch.JobStatus, fldPath *field.Path) field.Error } if status.UncountedTerminatedPods != nil { path := fldPath.Child("uncountedTerminatedPods") - seen := sets.NewString() + seen := sets.New[types.UID]() for i, k := range status.UncountedTerminatedPods.Succeeded { p := path.Child("succeeded").Index(i) if k == "" { allErrs = append(allErrs, field.Invalid(p, k, "must not be empty")) - } else if seen.Has(string(k)) { + } else if seen.Has(k) { allErrs = append(allErrs, field.Duplicate(p, k)) } else { - seen.Insert(string(k)) + seen.Insert(k) } } for i, k := range status.UncountedTerminatedPods.Failed { p := path.Child("failed").Index(i) if k == "" { allErrs = append(allErrs, field.Invalid(p, k, "must not be empty")) - } else if seen.Has(string(k)) { + } else if seen.Has(k) { allErrs = append(allErrs, field.Duplicate(p, k)) } else { - seen.Insert(string(k)) + seen.Insert(k) } } }