Merge pull request #1259 from fao89/heattimeout

[18.0-fr1] Set Heat timeout
openstack-k8s-operators · Jan 14, 2025 · 2372bc0 · 2372bc0
2 parents c31ba06 + f828373
commit 2372bc0
Show file tree

Hide file tree

Showing 6 changed files with 215 additions and 58 deletions.
diff --git a/apis/core/v1beta1/openstackcontrolplane_webhook.go b/apis/core/v1beta1/openstackcontrolplane_webhook.go
@@ -863,6 +863,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