Skip to content

Commit 8c8ce8a

Browse files
committed
Correct defaulting of timeout
1 parent bf6b4b0 commit 8c8ce8a

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

api/v1beta1/common_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ func SetupDefaults() {
172172
APIContainerImageURL: util.GetEnvVar("RELATED_IMAGE_NOVA_API_IMAGE_URL_DEFAULT", NovaAPIContainerImage),
173173
SchedulerContainerImageURL: util.GetEnvVar("RELATED_IMAGE_NOVA_SCHEDULER_IMAGE_URL_DEFAULT", NovaSchedulerContainerImage),
174174
NovaCellDefaults: novaCellDefaults,
175+
APITimeout: 60,
175176
}
176177

177178
SetupNovaDefaults(novaDefaults)

api/v1beta1/nova_webhook.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import (
4444
type NovaDefaults struct {
4545
APIContainerImageURL string
4646
SchedulerContainerImageURL string
47+
APITimeout int
4748
NovaCellDefaults
4849
}
4950

@@ -92,6 +93,10 @@ func (spec *NovaSpecCore) Default() {
9293
spec.MetadataServiceTemplate.Enabled = ptr.To(true)
9394
}
9495

96+
if spec.APITimeout == 0 {
97+
spec.APITimeout = novaDefaults.APITimeout
98+
}
99+
95100
for cellName, cellTemplate := range spec.CellTemplates {
96101

97102
if cellTemplate.MetadataServiceTemplate.Enabled == nil {

0 commit comments

Comments
 (0)