Add support for configuring route annotations #168

api/bases/neutron.openstack.org_neutronapis.yaml

@@ -2092,6 +2092,14 @@ spec:
                       to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                     type: object
                 type: object
+              routeAnnotations:
+                description: RouteAnnotations to be added to the created route
+                properties:
+                  timeout:
+                    description: Timeout - Provides the HAProxy Timeout value for
+                      the route
+                    type: string
+                type: object
               secret:
                 description: Secret containing OpenStack password information for
                   NeutronDatabasePassword, NeutronPassword

api/v1beta1/neutronapi_types.go

@@ -134,6 +134,10 @@ type NeutronAPISpec struct {
 	// ExtraMounts containing conf files
 	// +kubebuilder:validation:Optional
 	ExtraMounts []NeutronExtraVolMounts `json:"extraMounts,omitempty"`
+
+	// RouteAnnotations to be added to the created route
+	// +kubebuilder:validation:Optional
+	RouteAnnotations NeutronRouteAnnotations `json:"routeAnnotations,omitempty"`
 }
 
 // MetalLBConfig to configure the MetalLB loadbalancer service
@@ -194,6 +198,13 @@ type NeutronAPIDebug struct {
 	Service bool `json:"service"`
 }
 
+// NeutronRouteAnnotations defines the route annotations
+type NeutronRouteAnnotations struct {
+	// +kubebuilder:validation:Optional
+	// Timeout - Provides the HAProxy Timeout value for the route
+	Timeout string `json:"timeout"`
+}
+
 // NeutronAPIStatus defines the observed state of NeutronAPI
 type NeutronAPIStatus struct {
 	// ReadyCount of neutron API instances

config/crd/bases/neutron.openstack.org_neutronapis.yaml

@@ -2092,6 +2092,14 @@ spec:
                       to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                     type: object
                 type: object
+              routeAnnotations:
+                description: RouteAnnotations to be added to the created route
+                properties:
+                  timeout:
+                    description: Timeout - Provides the HAProxy Timeout value for
+                      the route
+                    type: string
+                type: object
               secret:
                 description: Secret containing OpenStack password information for
                   NeutronDatabasePassword, NeutronPassword

config/samples/neutron_v1beta1_neutronapi.yaml

@@ -18,3 +18,5 @@ spec:
   containerImage: quay.io/podified-antelope-centos9/openstack-neutron-server:current-podified
   replicas: 1
   secret: neutron-secret
+  routeAnnotations:
+    timeout: 120s

controllers/neutronapi_controller.go

@@ -59,6 +59,10 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+const (
+	routeTimeoutAnnotationName string = "haproxy.router.openshift.io/timeout"
+)
+
 // NeutronAPIReconciler reconciles a NeutronAPI object
 type NeutronAPIReconciler struct {
 	client.Client
@@ -412,12 +416,18 @@ func (r *NeutronAPIReconciler) reconcileInit(
 		ports[metallbcfg.Endpoint] = portCfg
 	}
 
+	routeAnnotations := make(map[string]string)
+	if instance.Spec.RouteAnnotations.Timeout != "" {
+		routeAnnotations[routeTimeoutAnnotationName] = instance.Spec.RouteAnnotations.Timeout
+	}
+
 	apiEndpoints, ctrlResult, err := endpoint.ExposeEndpoints(
 		ctx,
 		helper,
 		neutronapi.ServiceName,
 		serviceLabels,
 		ports,
+		routeAnnotations,
 		time.Duration(5)*time.Second,
 	)
 	if err != nil {