From b6fbe5e622f17733159f65c673adcfc9c05b2bb1 Mon Sep 17 00:00:00 2001 From: JaredTan95 Date: Tue, 4 May 2021 08:57:15 +0800 Subject: [PATCH] remove old ip checks Signed-off-by: JaredTan95 --- pkg/apis/core/validation/validation.go | 6 +----- pkg/apis/core/validation/validation_test.go | 7 ------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/pkg/apis/core/validation/validation.go b/pkg/apis/core/validation/validation.go index d9ebd9f9399..839c7b53582 100644 --- a/pkg/apis/core/validation/validation.go +++ b/pkg/apis/core/validation/validation.go @@ -4085,11 +4085,7 @@ func ValidatePodStatusUpdate(newPod, oldPod *core.Pod, opts PodValidationOptions allErrs = append(allErrs, ValidateContainerStateTransition(newPod.Status.InitContainerStatuses, oldPod.Status.InitContainerStatuses, fldPath.Child("initContainerStatuses"), oldPod.Spec.RestartPolicy)...) if newIPErrs := validatePodIPs(newPod); len(newIPErrs) > 0 { - // Tolerate IP errors if IP errors already existed in the old pod. See http://issue.k8s.io/90625 - // TODO(liggitt): Drop the check of oldPod in 1.20 - if oldIPErrs := validatePodIPs(oldPod); len(oldIPErrs) == 0 { - allErrs = append(allErrs, newIPErrs...) - } + allErrs = append(allErrs, newIPErrs...) } return allErrs diff --git a/pkg/apis/core/validation/validation_test.go b/pkg/apis/core/validation/validation_test.go index 7256cb1df86..d84a206eef4 100644 --- a/pkg/apis/core/validation/validation_test.go +++ b/pkg/apis/core/validation/validation_test.go @@ -16719,13 +16719,6 @@ func TestPodIPsValidation(t *testing.T) { oldPod.Name = newPod.Name errs := ValidatePodStatusUpdate(newPod, oldPod, PodValidationOptions{}) - if oldTestCase.expectError { - // The old pod was invalid, tolerate invalid IPs in the new pod as well - if len(errs) > 0 { - t.Fatalf("expected success for update to pod with already-invalid IPs, got errors: %v", errs) - } - continue - } if len(errs) == 0 && testCase.expectError { t.Fatalf("expected failure for %s, but there were none", testCase.pod.Name)