Support manila setting route annotations

This patch allows Manila to set its route annotations. Depends-On: openstack-k8s-operators/manila-operator#282
Akrog · Jun 10, 2024 · bbb3c66 · bbb3c66
1 parent 8f11476
commit bbb3c66
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/apis/core/v1beta1/openstackcontrolplane_webhook.go b/apis/core/v1beta1/openstackcontrolplane_webhook.go
@@ -479,6 +479,8 @@ func (r *OpenStackControlPlane) DefaultServices() {
 
 	// Manila
 	r.Spec.Manila.Template.Default()
+	initializeOverrideSpec(&r.Spec.Manila.APIOverride.Route, true)
+	r.Spec.Manila.Template.SetDefaultRouteAnnotations(r.Spec.Manila.APIOverride.Route.Annotations)
 
 	// Memcached
 	for key, template := range r.Spec.Memcached.Templates {

diff --git a/tests/functional/openstackoperator_controller_test.go b/tests/functional/openstackoperator_controller_test.go
@@ -564,6 +564,8 @@ var _ = Describe("OpenStackOperator controller", func() {
 				Expect(OSCtlplane.Spec.Glance.APIOverride[name].Route.Annotations).Should(HaveKeyWithValue("haproxy.router.openshift.io/timeout", "60s"))
 				Expect(OSCtlplane.Spec.Glance.APIOverride[name].Route.Annotations).Should(HaveKeyWithValue("api.glance.openstack.org/timeout", "60s"))
 			}
+			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"))
 		})
 
 		It("should create selfsigned issuer and public+internal CA and issuer", func() {