Support Octavia setting route annotations

This patch allows Octavia to set its route annotations. Depends-On: openstack-k8s-operators/octavia-operator#376
fernandoroyosanchez · Sep 13, 2024 · 4fc2990 · 4fc2990
1 parent 8eb817a
commit 4fc2990
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/apis/core/v1beta1/openstackcontrolplane_webhook.go b/apis/core/v1beta1/openstackcontrolplane_webhook.go
@@ -869,6 +869,7 @@ func (r *OpenStackControlPlane) DefaultServices() {
 		}
 
 		r.Spec.Octavia.Template.Default()
+                setOverrideSpec(&r.Spec.Octavia.APIOverride.Route, r.Spec.Octavia.Template.GetDefaultRouteAnnotations())
 	}
 
 	// Barbican

diff --git a/tests/functional/ctlplane/openstackoperator_controller_test.go b/tests/functional/ctlplane/openstackoperator_controller_test.go
@@ -576,6 +576,7 @@ var _ = Describe("OpenStackOperator controller", func() {
 			Expect(OSCtlplane.Spec.Manila.APIOverride.Route).Should(Not(BeNil()))
 			Expect(OSCtlplane.Spec.Manila.APIOverride.Route.Annotations).Should(HaveKeyWithValue("haproxy.router.openshift.io/timeout", "60s"))
 			Expect(OSCtlplane.Spec.Manila.APIOverride.Route.Annotations).Should(HaveKeyWithValue("api.manila.openstack.org/timeout", "60s"))
+			Expect(OSCtlplane.Spec.Octavia.APIOverride.Route.Annotations).Should(HaveKeyWithValue("haproxy.router.openshift.io/timeout", "120s"))
 		})
 
 		It("should create selfsigned issuer and public+internal CA and issuer", func() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -869,6 +869,7 @@ func (r *OpenStackControlPlane) DefaultServices() { @@
     		}
     		r.Spec.Octavia.Template.Default()
+                    setOverrideSpec(&r.Spec.Octavia.APIOverride.Route, r.Spec.Octavia.Template.GetDefaultRouteAnnotations())
     	}
     	// Barbican
@@ Expand Down @@