Add configurable httpd timeout

This patch adds an apiTimeout field to the OctaviaSpecCore
to the already OctaviaSpec one to allow configure the timeouts
for HAProxy and Apache.

Also fixing *core* API spec version of the new
GetDefaultRouteAnnotations function.

Jira: https://issues.redhat.com/browse/OSPRH-6713

api/bases/octavia.openstack.org_octaviaapis.yaml

@@ -48,6 +48,10 @@ spec:
           spec:
             description: OctaviaAPISpec defines the desired state of OctaviaAPI
             properties:
+              apiTimeout:
+                description: APITimeout for HAProxy and Apache defaults to OctaviaSpecCore
+                  APITimeout (seconds)
+                type: string
               containerImage:
                 description: Octavia Container Image URL
                 type: string

api/bases/octavia.openstack.org_octavias.yaml

@@ -150,6 +150,10 @@ spec:
                 description: OctaviaAPI - Spec definition for the API service of the
                   Octavia deployment
                 properties:
+                  apiTimeout:
+                    description: APITimeout for HAProxy and Apache defaults to OctaviaSpecCore
+                      APITimeout (seconds)
+                    type: string
                   containerImage:
                     description: Octavia Container Image URL
                     type: string

api/v1beta1/octavia_webhook.go

@@ -198,9 +198,34 @@ func (r *Octavia) ValidateDelete() (admission.Warnings, error) {
 	return nil, nil
 }
 
-func (spec *OctaviaSpec) GetDefaultRouteAnnotations() (annotations map[string]string) {
-	annotations = map[string]string{
+func (spec *OctaviaAPISpecCore) GetDefaultRouteAnnotations() (annotations map[string]string) {
+	return map[string]string{
 		"haproxy.router.openshift.io/timeout": octaviaDefaults.OctaviaAPIRouteTimeout,
 	}
-	return
+}
+
+// SetDefaultRouteAnnotations sets HAProxy timeout values of the route
+func (octaviaAPI *OctaviaAPISpecCore) SetDefaultRouteAnnotations(annotations map[string]string) {
+	const haProxyAnno = "haproxy.router.openshift.io/timeout"
+	// Use a custom annotation to flag when the operator has set the default HAProxy timeout
+	// With the annotation func determines when to overwrite existing HAProxy timeout with the APITimeout
+	const octaviaAnno = "api.octavia.openstack.org/timeout"
+
+	valOctavia, okOctavia := annotations[octaviaAnno]
+	valHAProxy, okHAProxy := annotations[haProxyAnno]
+
+	// Human operator set the HAProxy timeout manually
+	if !okOctavia && okHAProxy {
+		return
+	}
+
+	// Human operator modified the HAProxy timeout manually without removing the Octavia flag
+	if okOctavia && okHAProxy && valOctavia != valHAProxy {
+		delete(annotations, octaviaAnno)
+		return
+	}
+
+	timeout := octaviaAPI.APITimeout + "s"
+	annotations[octaviaAnno] = timeout
+	annotations[haProxyAnno] = timeout
 }

api/v1beta1/octaviaapi_types.go

@@ -141,6 +141,10 @@ type OctaviaAPISpecCore struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// TLS - Parameters related to the TLS
 	TLS OctaviaApiTLS `json:"tls,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// APITimeout for HAProxy and Apache defaults to OctaviaSpecCore APITimeout (seconds)
+	APITimeout string `json:"apiTimeout,omitempty"`
 }
 
 type OctaviaApiTLS struct {

config/crd/bases/octavia.openstack.org_octaviaapis.yaml

@@ -48,6 +48,10 @@ spec:
           spec:
             description: OctaviaAPISpec defines the desired state of OctaviaAPI
             properties:
+              apiTimeout:
+                description: APITimeout for HAProxy and Apache defaults to OctaviaSpecCore
+                  APITimeout (seconds)
+                type: string
               containerImage:
                 description: Octavia Container Image URL
                 type: string

config/crd/bases/octavia.openstack.org_octavias.yaml

@@ -150,6 +150,10 @@ spec:
                 description: OctaviaAPI - Spec definition for the API service of the
                   Octavia deployment
                 properties:
+                  apiTimeout:
+                    description: APITimeout for HAProxy and Apache defaults to OctaviaSpecCore
+                      APITimeout (seconds)
+                    type: string
                   containerImage:
                     description: Octavia Container Image URL
                     type: string

controllers/octaviaapi_controller.go

@@ -978,6 +978,8 @@ func (r *OctaviaAPIReconciler) generateServiceSecrets(
 	}
 	templateParameters["OVNDB_TLS"] = instance.Spec.TLS.Ovn.Enabled()
 
+	templateParameters["TimeOut"] = instance.Spec.APITimeout
+
 	// create httpd  vhost template parameters
 	httpdVhostConfig := map[string]interface{}{}
 	for _, endpt := range []service.Endpoint{service.EndpointInternal, service.EndpointPublic} {

templates/octaviaapi/config/httpd.conf

@@ -35,6 +35,8 @@ CustomLog /dev/stdout proxy env=forwarded
     CustomLog /dev/stdout combined env=!forwarded
     CustomLog /dev/stdout proxy env=forwarded
 
+    TimeOut {{ $.TimeOut }}
+
     {{- if $vhost.TLS }}
     SetEnvIf X-Forwarded-Proto https HTTPS=1