Merge pull request openstack-k8s-operators#1163 from fao89/OSPRH-10965

Set Heat timeout
averdagu · Nov 6, 2024 · b977d2e · b977d2e
2 parents e3b5ce5 + b2bd44d
commit b977d2e
Show file tree

Hide file tree

Showing 4 changed files with 201 additions and 58 deletions.
diff --git a/apis/core/v1beta1/openstackcontrolplane_webhook.go b/apis/core/v1beta1/openstackcontrolplane_webhook.go
@@ -860,6 +860,10 @@ func (r *OpenStackControlPlane) DefaultServices() {
 			r.Spec.Heat.Template = &heatv1.HeatSpecCore{}
 		}
 		r.Spec.Heat.Template.Default()
+		initializeOverrideSpec(&r.Spec.Heat.APIOverride.Route, true)
+		r.Spec.Heat.Template.SetDefaultRouteAnnotations(r.Spec.Heat.APIOverride.Route.Annotations)
+		initializeOverrideSpec(&r.Spec.Heat.CnfAPIOverride.Route, true)
+		r.Spec.Heat.Template.SetDefaultRouteAnnotations(r.Spec.Heat.CnfAPIOverride.Route.Annotations)
 	}
 
 	// Swift