diff --git a/staging/src/k8s.io/legacy-cloud-providers/aws/aws.go b/staging/src/k8s.io/legacy-cloud-providers/aws/aws.go index 93e9a6603e1..c74eef1199f 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/aws/aws.go +++ b/staging/src/k8s.io/legacy-cloud-providers/aws/aws.go @@ -3771,14 +3771,6 @@ func (c *Cloud) buildNLBHealthCheckConfiguration(svc *v1.Service) (healthCheckCo return healthCheckConfig{}, err } - if hc.HealthyThreshold != hc.UnhealthyThreshold { - return healthCheckConfig{}, fmt.Errorf("Health check healthy threshold and unhealthy threshold must be equal") - } - - if hc.Interval != 10 && hc.Interval != 30 { - return healthCheckConfig{}, fmt.Errorf("Invalid health check interval '%v', must be either 10 or 30", hc.Interval) - } - if hc.Port != defaultHealthCheckPort { if _, err := strconv.ParseInt(hc.Port, 10, 0); err != nil { return healthCheckConfig{}, fmt.Errorf("Invalid health check port '%v'", hc.Port) diff --git a/staging/src/k8s.io/legacy-cloud-providers/aws/aws_test.go b/staging/src/k8s.io/legacy-cloud-providers/aws/aws_test.go index 1b04429d8e6..56fd43dd12c 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/aws/aws_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/aws/aws_test.go @@ -2961,7 +2961,7 @@ func TestCloud_buildNLBHealthCheckConfiguration(t *testing.T) { wantError: false, }, { - name: "invalid interval", + name: "interval not 10 or 30", service: &v1.Service{ ObjectMeta: metav1.ObjectMeta{ Name: "test-svc", @@ -2982,8 +2982,15 @@ func TestCloud_buildNLBHealthCheckConfiguration(t *testing.T) { }, }, }, - want: healthCheckConfig{}, - wantError: true, + want: healthCheckConfig{ + Port: "traffic-port", + Protocol: elbv2.ProtocolEnumTcp, + Interval: 23, + Timeout: 10, + HealthyThreshold: 3, + UnhealthyThreshold: 3, + }, + wantError: false, }, { name: "invalid timeout", @@ -3033,8 +3040,15 @@ func TestCloud_buildNLBHealthCheckConfiguration(t *testing.T) { }, }, }, - want: healthCheckConfig{}, - wantError: true, + want: healthCheckConfig{ + Port: "traffic-port", + Protocol: elbv2.ProtocolEnumTcp, + Interval: 30, + Timeout: 10, + HealthyThreshold: 7, + UnhealthyThreshold: 5, + }, + wantError: false, }, }