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 Nov 5, 2024
1 parent f6f541e commit 557c44f
Show file tree
Hide file tree
Showing 9 changed files with 209 additions and 70 deletions.
4 changes: 4 additions & 0 deletions apis/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4086,6 +4086,10 @@ spec:
type: boolean
template:
properties:
apiTimeout:
default: 600
minimum: 60
type: integer
customServiceConfig:
type: string
customServiceConfigSecrets:
Expand Down
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: 2 additions & 2 deletions apis/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ require (
github.com/openstack-k8s-operators/cinder-operator/api v0.5.1-0.20241028144414-a808b251e33e
github.com/openstack-k8s-operators/designate-operator/api v0.5.1-0.20241028193827-54b29d3be9c8
github.com/openstack-k8s-operators/glance-operator/api v0.5.1-0.20241022110417-3b151e5b810c
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20241028122113-c2f377d68315
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20241105092027-bd9afacc9d48
github.com/openstack-k8s-operators/horizon-operator/api v0.5.1-0.20241028160645-2281f355789a
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20241028170713-5ec7ef2dc6e3
github.com/openstack-k8s-operators/ironic-operator/api v0.4.1-0.20241016184335-60fb2a3ccf1a
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20241028071533-ae2b9a574fda
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20241028071009-a8404d0ab6bb
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20241029151503-4878b3fa3333
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20241104140916-71a0e9d9766d
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20241021160008-f0273be177b4
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20241028074300-17b2cf83d27e
Expand Down
8 changes: 4 additions & 4 deletions apis/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ github.com/openstack-k8s-operators/designate-operator/api v0.5.1-0.2024102819382
github.com/openstack-k8s-operators/designate-operator/api v0.5.1-0.20241028193827-54b29d3be9c8/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.20241028122113-c2f377d68315 h1:OUSRiEC5VH3OxeAz6PVyN9Zm4E7v1Y57wqaP263Y9qM=
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20241028122113-c2f377d68315/go.mod h1:+PryuWrcDartYhOi9hJHHj78P1/XeMWPJwngY+zA4lA=
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20241105092027-bd9afacc9d48 h1:tuaeYgT8DLT2CxETnc1b9AUY0h6SHOkjXzdK2sPyBAw=
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20241105092027-bd9afacc9d48/go.mod h1:1w7CvsvVaTMIj3fvYfP4Wer//ihu2yT+lYpdK+9Xu8o=
github.com/openstack-k8s-operators/horizon-operator/api v0.5.1-0.20241028160645-2281f355789a h1:hviFqsPwNzRXF1y0wvmh0Fmt2Kqhjyl50e+7pDVVz8o=
github.com/openstack-k8s-operators/horizon-operator/api v0.5.1-0.20241028160645-2281f355789a/go.mod h1:Iq/tUosgNxLUSwY7j4tXFsEmMlr0AV44nsZsTkOKBmo=
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20241028170713-5ec7ef2dc6e3 h1:hbWxfk2h5kLbDLxYem4pUCAjgb4z49LCxJHaa7loiwc=
Expand All @@ -112,8 +112,8 @@ github.com/openstack-k8s-operators/ironic-operator/api v0.4.1-0.20241016184335-6
github.com/openstack-k8s-operators/ironic-operator/api v0.4.1-0.20241016184335-60fb2a3ccf1a/go.mod h1:qxdXTRt7kY6orSnFc/OTRHtqElNPuMV0W0KvMPHbE2s=
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20241028071533-ae2b9a574fda h1:aCBLS8MvLJhiOOVyYcukaReeqM01c26eKjRI2w29FWI=
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20241028071533-ae2b9a574fda/go.mod h1:llI4Qbt8Rj9sWLpkY32u3UJBh1tFKPiS1RGgBaYVq/g=
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/common v0.5.1-0.20241029151503-4878b3fa3333 h1:yejekTWudX5af3mCJQ1MUPLEa0X6sIsklf07o9KilRk=
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20241029151503-4878b3fa3333/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.1-0.20241104140916-71a0e9d9766d h1:6fA7kvhKRelVwNWxcMVe2d2lkN8MITY0OIudTBnmT+A=
Expand Down
4 changes: 4 additions & 0 deletions config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4086,6 +4086,10 @@ spec:
type: boolean
template:
properties:
apiTimeout:
default: 600
minimum: 60
type: integer
customServiceConfig:
type: string
customServiceConfigSecrets:
Expand Down
Loading

0 comments on commit 557c44f

Please sign in to comment.