github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 11:28:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #132548 from gavinkflam/130656-fix-duplicate-validations-2

Browse Source 
bug: Remove duplicate DaemonSet update validations
This commit is contained in:
Kubernetes Prow Robot
2025-07-15 12:06:30 -07:00
committed by GitHub
parent 06b62dcae7 c6c15bbe44
commit a76eddf608
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/registry/apps/daemonset/strategy.go
View File

@@ -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.

4
pkg/registry/apps/replicaset/strategy.go
View File

@@ -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.