From aaa91ef4121a6236186c07e127decddb6e99c7fe Mon Sep 17 00:00:00 2001 From: Andrew Sy Kim Date: Fri, 15 Nov 2019 08:57:17 -0500 Subject: [PATCH] service topology: remove redundant API validation for local external traffic policy Signed-off-by: Andrew Sy Kim --- pkg/apis/core/validation/validation.go | 5 +---- pkg/apis/core/validation/validation_test.go | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkg/apis/core/validation/validation.go b/pkg/apis/core/validation/validation.go index a955f4d5087..4ad241c745b 100644 --- a/pkg/apis/core/validation/validation.go +++ b/pkg/apis/core/validation/validation.go @@ -4175,10 +4175,7 @@ func validateServiceExternalTrafficFieldsValue(service *core.Service) field.Erro allErrs = append(allErrs, field.Invalid(field.NewPath("spec").Child("externalTrafficPolicy"), service.Spec.ExternalTrafficPolicy, fmt.Sprintf("ExternalTrafficPolicy must be empty, %v or %v", core.ServiceExternalTrafficPolicyTypeCluster, core.ServiceExternalTrafficPolicyTypeLocal))) } - // 'externalTrafficPolicy=Local' is mutually exclusive with topologyKeys - if service.Spec.ExternalTrafficPolicy == core.ServiceExternalTrafficPolicyTypeLocal && len(service.Spec.TopologyKeys) > 0 { - allErrs = append(allErrs, field.Forbidden(field.NewPath("spec").Child("externalTrafficPolicy"), "externalTrafficPolicy must not be set to 'Local' when topologyKeys is specified")) - } + if service.Spec.HealthCheckNodePort < 0 { allErrs = append(allErrs, field.Invalid(field.NewPath("spec").Child("healthCheckNodePort"), service.Spec.HealthCheckNodePort, "HealthCheckNodePort must be not less than 0")) diff --git a/pkg/apis/core/validation/validation_test.go b/pkg/apis/core/validation/validation_test.go index 2c88c3f2d15..f7b4377bda9 100644 --- a/pkg/apis/core/validation/validation_test.go +++ b/pkg/apis/core/validation/validation_test.go @@ -10127,7 +10127,7 @@ func TestValidateService(t *testing.T) { "kubernetes.io/hostname", } }, - numErrs: 2, + numErrs: 1, }, }