Merge pull request kubernetes#1662 from openshift-cherrypick-robot/ch…

…erry-pick-1657-to-release-4.12 [release-4.12] OCPBUGS-17159: Increase service idle max timeout to 100 minutes
soltysh · Aug 17, 2023 · 3b52eeb · 3b52eeb
2 parents 1485cc9 + 74292ce
commit 3b52eeb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer.go
@@ -879,7 +879,7 @@ func getDomainNameLabel(pip *network.PublicIPAddress) string {
 func getIdleTimeout(s *v1.Service) (*int32, error) {
 	const (
 		min = 4
-		max = 30
+		max = 100
 	)
 
 	val, ok := s.Annotations[ServiceAnnotationLoadBalancerIdleTimeout]

diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer_test.go
@@ -282,7 +282,7 @@ func TestGetIdleTimeout(t *testing.T) {
 		{desc: "annotation negative value", annotations: map[string]string{ServiceAnnotationLoadBalancerIdleTimeout: "-6"}, err: true},
 		{desc: "annotation zero value", annotations: map[string]string{ServiceAnnotationLoadBalancerIdleTimeout: "0"}, err: true},
 		{desc: "annotation too low value", annotations: map[string]string{ServiceAnnotationLoadBalancerIdleTimeout: "3"}, err: true},
-		{desc: "annotation too high value", annotations: map[string]string{ServiceAnnotationLoadBalancerIdleTimeout: "31"}, err: true},
+		{desc: "annotation too high value", annotations: map[string]string{ServiceAnnotationLoadBalancerIdleTimeout: "101"}, err: true},
 		{desc: "annotation good value", annotations: map[string]string{ServiceAnnotationLoadBalancerIdleTimeout: "24"}, i: to.Int32Ptr(24)},
 	} {
 		t.Run(c.desc, func(t *testing.T) {