OCPBUGS-28673: implement connect timeout tuning option

go.mod

@@ -2,7 +2,7 @@ module github.com/openshift/cluster-ingress-operator
 
 go 1.21
 
-toolchain go1.21.5
+toolchain go1.21.7
 
 require (
 	github.com/Azure/azure-sdk-for-go v46.0.0+incompatible
@@ -150,6 +150,6 @@ require (
 // github.com/operator-framework/operator-sdk.
 replace (
 	bitbucket.org/ww/goautoneg => github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d
-	github.com/openshift/api => github.com/openshift/api v0.0.0-20240326215622-ff84c2c73227
+	github.com/openshift/api => github.com/openshift/api v0.0.0-20240405164942-0cc42a39da45
 	k8s.io/client-go => k8s.io/client-go v0.29.0
 )

go.sum

@@ -1645,8 +1645,8 @@ github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.m
 github.com/opencontainers/runtime-spec v0.1.2-0.20190618234442-a950415649c7/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-spec v1.0.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
-github.com/openshift/api v0.0.0-20240326215622-ff84c2c73227 h1:rqvWUAipMFoiAZW4UQlEVnVxWcLfFBu3LOtSKFescSk=
-github.com/openshift/api v0.0.0-20240326215622-ff84c2c73227/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
+github.com/openshift/api v0.0.0-20240405164942-0cc42a39da45 h1:b7xiV2SQrAHlV7CBbGcOLSE8fsBscJ1dCo4akExV5aU=
+github.com/openshift/api v0.0.0-20240405164942-0cc42a39da45/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
 github.com/openshift/build-machinery-go v0.0.0-20200211121458-5e3d6e570160/go.mod h1:1CkcsT3aVebzRBzVTSbiKSkJMsC/CASqxesfqEMfJEc=
 github.com/openshift/client-go v0.0.0-20200116152001-92a2713fa240/go.mod h1:4riOwdj99Hd/q+iAcJZfNCsQQQMwURnZV6RL4WHYS5w=
 github.com/openshift/client-go v0.0.0-20230120202327-72f107311084 h1:66uaqNwA+qYyQDwsMWUfjjau8ezmg1dzCqub13KZOcE=

manifests/00-custom-resource-definition-internal.yaml

@@ -7,7 +7,6 @@ metadata:
     capability.openshift.io/name: Ingress
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   name: dnsrecords.ingress.operator.openshift.io
 spec:
   group: ingress.operator.openshift.io

manifests/00-custom-resource-definition.yaml

@@ -7,7 +7,6 @@ metadata:
     capability.openshift.io/name: Ingress
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
   name: ingresscontrollers.operator.openshift.io
 spec:
   group: operator.openshift.io
@@ -1552,6 +1551,18 @@ spec:
                       the default timeout is 30s"
                     format: duration
                     type: string
+                  connectTimeout:
+                    description: "ConnectTimeout defines the maximum time to wait
+                      for a connection attempt to a server/backend to succeed. \n
+                      This field expects an unsigned duration string of decimal numbers,
+                      each with optional fraction and a unit suffix, e.g. \"300ms\",
+                      \"1.5h\" or \"2h45m\". Valid time units are \"ns\", \"us\" (or
+                      \"µs\" U+00B5 or \"μs\" U+03BC), \"ms\", \"s\", \"m\", \"h\".
+                      \n When omitted, this means the user has no opinion and the
+                      platform is left to choose a reasonable default. This default
+                      is subject to change over time. The current default is 5s."
+                    pattern: ^(0|([0-9]+(\.[0-9]+)?(ns|us|µs|μs|ms|s|m|h))+)$
+                    type: string
                   headerBufferBytes:
                     description: "headerBufferBytes describes how much memory should
                       be reserved (in bytes) for IngressController connection sessions.

pkg/operator/controller/ingress/deployment.go

@@ -610,6 +610,9 @@ func desiredRouterDeployment(ci *operatorv1.IngressController, ingressController
 	if ci.Spec.TuningOptions.TunnelTimeout != nil && ci.Spec.TuningOptions.TunnelTimeout.Duration > 0*time.Second {
 		env = append(env, corev1.EnvVar{Name: "ROUTER_DEFAULT_TUNNEL_TIMEOUT", Value: durationToHAProxyTimespec(ci.Spec.TuningOptions.TunnelTimeout.Duration)})
 	}
+	if ci.Spec.TuningOptions.ConnectTimeout != nil && ci.Spec.TuningOptions.ConnectTimeout.Duration > 0*time.Second {
+		env = append(env, corev1.EnvVar{Name: "ROUTER_DEFAULT_CONNECT_TIMEOUT", Value: durationToHAProxyTimespec(ci.Spec.TuningOptions.ConnectTimeout.Duration)})
+	}
 	if ci.Spec.TuningOptions.TLSInspectDelay != nil && ci.Spec.TuningOptions.TLSInspectDelay.Duration > 0*time.Second {
 		env = append(env, corev1.EnvVar{Name: "ROUTER_INSPECT_DELAY", Value: durationToHAProxyTimespec(ci.Spec.TuningOptions.TLSInspectDelay.Duration)})
 	}

pkg/operator/controller/ingress/deployment_test.go

@@ -166,6 +166,7 @@ func TestTuningOptions(t *testing.T) {
 	ic.Spec.TuningOptions.ServerTimeout = &metav1.Duration{Duration: 60 * time.Second}
 	ic.Spec.TuningOptions.ServerFinTimeout = &metav1.Duration{Duration: 4 * time.Second}
 	ic.Spec.TuningOptions.TunnelTimeout = &metav1.Duration{Duration: 30 * time.Minute}
+	ic.Spec.TuningOptions.ConnectTimeout = &metav1.Duration{Duration: 30 * time.Second}
 	ic.Spec.TuningOptions.TLSInspectDelay = &metav1.Duration{Duration: 5 * time.Second}
 	ic.Spec.TuningOptions.HealthCheckInterval = &metav1.Duration{Duration: 15 * time.Second}
 	ic.Spec.TuningOptions.ReloadInterval = metav1.Duration{Duration: 30 * time.Second}
@@ -182,6 +183,7 @@ func TestTuningOptions(t *testing.T) {
 		{"ROUTER_DEFAULT_SERVER_TIMEOUT", true, "1m"},
 		{"ROUTER_DEFAULT_SERVER_FIN_TIMEOUT", true, "4s"},
 		{"ROUTER_DEFAULT_TUNNEL_TIMEOUT", true, "30m"},
+		{"ROUTER_DEFAULT_CONNECT_TIMEOUT", true, "30s"},
 		{"ROUTER_INSPECT_DELAY", true, "5s"},
 		{RouterBackendCheckInterval, true, "15s"},
 		{RouterReloadIntervalEnvName, true, "30s"},
@@ -432,6 +434,7 @@ func Test_desiredRouterDeployment(t *testing.T) {
 		{"ROUTER_DEFAULT_SERVER_FIN_TIMEOUT", false, ""},
 		{"ROUTER_DEFAULT_SERVER_TIMEOUT", false, ""},
 		{"ROUTER_DEFAULT_TUNNEL_TIMEOUT", false, ""},
+		{"ROUTER_DEFAULT_CONNECT_TIMEOUT", false, ""},
 		{"ROUTER_ERRORFILE_503", false, ""},
 		{"ROUTER_ERRORFILE_404", false, ""},
 		{"ROUTER_HAPROXY_CONFIG_MANAGER", false, ""},