Fix manila apiOverride route configuration haproxy timeout annotation under metadata.annotations

[MiguelCarpio]

What does this PR do?
Fix manila apiOverride route configuration from the inline JSON format to the proper nested YAML structure with the HAProxy timeout annotation under metadata.annotations

Why do we need it?
Base openstackcontrolplane has haproxy timeout directly under route, but the CRD schema requires it to be under route.metadata.annotations.

╰$ oc explain openstackcontrolplane.spec.manila.apiOverride --recursive
GROUP:      core.openstack.org
KIND:       OpenStackControlPlane
VERSION:    v1beta1

FIELD: apiOverride <Object>


DESCRIPTION:
    <empty>
FIELDS:
  route	<Object>
    metadata	<Object>
      annotations	<map[string]string>
      labels	<map[string]string>

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: MiguelCarpio
Once this PR has been reviewed and has the lgtm label, please assign raukadah for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-ci]

Hi @MiguelCarpio. Thanks for your PR.

I'm waiting for a openstack-k8s-operators member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[tosky]

Are you sure the annotation way works at all? In some previous changes for cinder, glance and nove the way to configure the timeout turned out to be different, and the annotation was just the output.

See: #596

[abays]

/ok-to-test

[fmount]

+1 on @tosky 's comment. While the change itself is syntactical correct, the recommended way to increase the timeout is to rely on apiTimeout parameter that keep both the Haproxy and httpd side of things aligned. I think we can remove entirely this annotation from lib/control-plane/base/openstackcontrolplane.yaml (like we did for the other services) and update the apiTimeout parameter if required [1].

[1] https://github.com/openstack-k8s-operators/manila-operator/blob/main/api/v1beta1/manila_types.go#L134

[fultonj]

@MiguelCarpio please update as per @fmount's comment if you want to continue with this PR. Thanks.

[MiguelCarpio]

@MiguelCarpio please update as per @fmount's comment if you want to continue with this PR. Thanks.

All right, I will work on that, thank you all!!