Skip to content

Commit

Permalink
Set Heat timeout
Browse files Browse the repository at this point in the history 
Depends-On: openstack-k8s-operators/heat-operator#463

ref OSPRH-10965

Signed-off-by: Fabricio Aguiar <[email protected]>
  • Loading branch information
@fao89
fao89 committed Oct 29, 2024
1 parent c2bf0c5 commit ca8fe21
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
4 changes: 4 additions & 0 deletions apis/core/v1beta1/openstackcontrolplane_webhook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ require (
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20241028071533-ae2b9a574fda
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.5.0
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.4.1-0.20241028071009-a8404d0ab6bb
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20241025164019-30baa23bf6f1
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20241028071009-a8404d0ab6bb
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.0
github.com/openstack-k8s-operators/lib-common/modules/test v0.5.0
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20241021160008-f0273be177b4
Expand Down Expand Up @@ -126,3 +126,5 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202408300231

// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.9.0_patches_tag)
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20241017142550-a3524acedd49 //allow-merging

replace github.com/openstack-k8s-operators/heat-operator/api => github.com/fao89/heat-operator/api v0.0.0-20241028162238-0170e01b3f3d //allow-merging
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ github.com/evanphx/json-patch v5.7.0+incompatible h1:vgGkfT/9f8zE6tvSCe74nfpAVDQ
github.com/evanphx/json-patch v5.7.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg=
github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
github.com/fao89/heat-operator/api v0.0.0-20241028162238-0170e01b3f3d h1:nXGtGR+mFa0g0hvI7hw3sb8TNIkpSl/Uyb6yS7x/CwY=
github.com/fao89/heat-operator/api v0.0.0-20241028162238-0170e01b3f3d/go.mod h1:+PryuWrcDartYhOi9hJHHj78P1/XeMWPJwngY+zA4lA=
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
Expand Down Expand Up @@ -108,8 +110,6 @@ github.com/openstack-k8s-operators/designate-operator/api v0.5.1-0.2024102516444
github.com/openstack-k8s-operators/designate-operator/api v0.5.1-0.20241025164445-fa08997fd3cc/go.mod h1:aLc4dvPi5Bqb8FXnZ14YYRWFjZOmUdj+eJmaUPNZ5Qs=
github.com/openstack-k8s-operators/glance-operator/api v0.5.1-0.20241022110417-3b151e5b810c h1:m5Tx6BNK2MmCGBJnc7JCP+/OvVYJKhH30rtfUrS2+qs=
github.com/openstack-k8s-operators/glance-operator/api v0.5.1-0.20241022110417-3b151e5b810c/go.mod h1:xRoM6j/L1yvUhghhF/OL5GExWlahTf64Z5svidliqsE=
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20241028092336-0d5af8b9f185 h1:LnqRcYiocb6byTRG11cJd9/WgkFPc/z1SqrfLib7GLc=
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20241028092336-0d5af8b9f185/go.mod h1:BfzHYTAq8UWjmZJWAXBcpVTq3/GezUQ1ztwy2KWDFxA=
github.com/openstack-k8s-operators/horizon-operator/api v0.5.1-0.20241023025031-0069637676d3 h1:QLk0zzdfu6kHP5mZNYZTWEGaopqGhRL1a+dQ7PaPsuo=
github.com/openstack-k8s-operators/horizon-operator/api v0.5.1-0.20241023025031-0069637676d3/go.mod h1:6qGsJdObALYyH1G4mRLyRpmpTKsmTrKLGxx2hFUtU28=
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20241024081600-3e23dc62002c h1:/TXY/Hux6hfDEx5KIWQIMx7IKs2no4Pa/TsTVKDuLkw=
Expand All @@ -122,8 +122,8 @@ github.com/openstack-k8s-operators/lib-common/modules/ansible v0.5.0 h1:M6tou1UD
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.5.0/go.mod h1:FxA/2ChDnVKgbZAyiiRLDGZB7WMcrHlOMBZYUQGgRf0=
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.4.1-0.20241028071009-a8404d0ab6bb h1:d8UIhviRnS63EGNbe5rS7gkc6ZMI9m1OeymsxgEjW4M=
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.4.1-0.20241028071009-a8404d0ab6bb/go.mod h1:MdZhEe4ciAXJwWygYBMJCIVONZWv+MqBIp/0+LxFcS0=
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20241025164019-30baa23bf6f1 h1:D4H+BMVKTjgYWptCBs7Qt0rk0K/H8PnjJKoMlozoQ4g=
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20241025164019-30baa23bf6f1/go.mod h1:tNeup9Xl7j2eaeMslJ/rt59NNEAw7ATf6RuebS/YkSk=
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20241028071009-a8404d0ab6bb h1:hbHzQN4NiRJPLZ10ctnPPygmaFIxQyYovCfgp7e9K88=
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20241028071009-a8404d0ab6bb/go.mod h1:YpNTuJhDWhbXM50O3qBkhO7M+OOyRmWkNVmJ4y3cyFs=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.0 h1:A8bwCA5B4AyIjt0Qzg0JgvF+HrZ9OQJOrSNq9jOFDpg=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.0/go.mod h1:djfljx3jfHqywhY3oDvPg/GLKwiFVkds6v7P7/Yg+8g=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.0 h1:iVGCAds5eVjKEoZS0KSBwYziLeLW3ZBs8PqPMrljPcg=
Expand Down

0 comments on commit ca8fe21

Please sign in to comment.