Merge pull request #1332 from mumesan/set_ironic_route_annotations_OS…

…PRH-10958 Set Ironic route annotations <JIRA: OSPRH-10958>
openstack-k8s-operators · Mar 11, 2025 · fc6a16d · fc6a16d
2 parents e25fdbc + 99d1f7d
commit fc6a16d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/apis/core/v1beta1/openstackcontrolplane_webhook.go b/apis/core/v1beta1/openstackcontrolplane_webhook.go
@@ -49,14 +49,14 @@ import (
 	networkv1 "github.com/openstack-k8s-operators/infra-operator/apis/network/v1beta1"
 	rabbitmqv1 "github.com/openstack-k8s-operators/infra-operator/apis/rabbitmq/v1beta1"
 	redisv1 "github.com/openstack-k8s-operators/infra-operator/apis/redis/v1beta1"
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	ironicv1 "github.com/openstack-k8s-operators/ironic-operator/api/v1beta1"
 	manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1"
 	neutronv1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1"
 	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
 	octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1"
 	swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1"
 	telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 )
 
 var ctlplaneWebhookClient client.Client
@@ -788,6 +788,11 @@ func (r *OpenStackControlPlane) DefaultServices() {
 			r.Spec.Ironic.Template.StorageClass = r.Spec.StorageClass
 		}
 		r.Spec.Ironic.Template.Default()
+
+		initializeOverrideSpec(&r.Spec.Ironic.APIOverride.Route, true)
+		initializeOverrideSpec(&r.Spec.Ironic.InspectorOverride.Route, true)
+		r.Spec.Ironic.Template.SetDefaultRouteAnnotations(r.Spec.Ironic.APIOverride.Route.Annotations)
+		r.Spec.Ironic.Template.SetDefaultInspectorRouteAnnotations(r.Spec.Ironic.InspectorOverride.Route.Annotations)
 	}
 
 	// Keystone

diff --git a/tests/functional/ctlplane/openstackoperator_controller_test.go b/tests/functional/ctlplane/openstackoperator_controller_test.go
@@ -667,6 +667,10 @@ var _ = Describe("OpenStackOperator controller", func() {
 			Expect(OSCtlplane.Spec.Keystone.APIOverride.Route).Should(Not(BeNil()))
 			Expect(OSCtlplane.Spec.Keystone.APIOverride.Route.Annotations).Should(HaveKeyWithValue("haproxy.router.openshift.io/timeout", "60s"))
 			Expect(OSCtlplane.Spec.Keystone.APIOverride.Route.Annotations).Should(HaveKeyWithValue("api.keystone.openstack.org/timeout", "60s"))
+			Expect(OSCtlplane.Spec.Ironic.APIOverride.Route).Should(Not(BeNil()))
+			Expect(OSCtlplane.Spec.Ironic.APIOverride.Route.Annotations).Should(HaveKeyWithValue("haproxy.router.openshift.io/timeout", "60s"))
+			Expect(OSCtlplane.Spec.Ironic.APIOverride.Route.Annotations).Should(HaveKeyWithValue("api.ironic.openstack.org/timeout", "60s"))
+			Expect(OSCtlplane.Spec.Ironic.InspectorOverride.Route.Annotations).Should(HaveKeyWithValue("inspector.ironic.openstack.org/timeout", "60s"))
 		})
 
 		It("should create selfsigned issuer and public+internal CA and issuer", func() {