From c6c15bbe4415b9673478b37eb501fd50b5288d4a Mon Sep 17 00:00:00 2001 From: Gavin Lam Date: Thu, 26 Jun 2025 00:11:20 -0400 Subject: [PATCH] bug: Remove duplicate DaemonSet update validations Signed-off-by: Gavin Lam --- pkg/registry/apps/daemonset/strategy.go | 5 +---- pkg/registry/apps/replicaset/strategy.go | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkg/registry/apps/daemonset/strategy.go b/pkg/registry/apps/daemonset/strategy.go index 87cbaacfc43..7745eeb6ff5 100644 --- a/pkg/registry/apps/daemonset/strategy.go +++ b/pkg/registry/apps/daemonset/strategy.go @@ -144,10 +144,7 @@ func (daemonSetStrategy) ValidateUpdate(ctx context.Context, obj, old runtime.Ob opts := pod.GetValidationOptionsFromPodTemplate(&newDaemonSet.Spec.Template, &oldDaemonSet.Spec.Template) opts.AllowInvalidLabelValueInSelector = opts.AllowInvalidLabelValueInSelector || metav1validation.LabelSelectorHasInvalidLabelValue(oldDaemonSet.Spec.Selector) - allErrs := validation.ValidateDaemonSet(obj.(*apps.DaemonSet), opts) - allErrs = append(allErrs, validation.ValidateDaemonSetUpdate(newDaemonSet, oldDaemonSet, opts)...) - - return allErrs + return validation.ValidateDaemonSetUpdate(newDaemonSet, oldDaemonSet, opts) } // WarningsOnUpdate returns warnings for the given update. diff --git a/pkg/registry/apps/replicaset/strategy.go b/pkg/registry/apps/replicaset/strategy.go index 64d34489e86..57a1565800e 100644 --- a/pkg/registry/apps/replicaset/strategy.go +++ b/pkg/registry/apps/replicaset/strategy.go @@ -142,9 +142,7 @@ func (rsStrategy) ValidateUpdate(ctx context.Context, obj, old runtime.Object) f oldReplicaSet := old.(*apps.ReplicaSet) opts := pod.GetValidationOptionsFromPodTemplate(&newReplicaSet.Spec.Template, &oldReplicaSet.Spec.Template) - allErrs := appsvalidation.ValidateReplicaSetUpdate(newReplicaSet, oldReplicaSet, opts) - - return allErrs + return appsvalidation.ValidateReplicaSetUpdate(newReplicaSet, oldReplicaSet, opts) } // WarningsOnUpdate returns warnings for the given update.