Merge pull request #536 from openshift-cherrypick-robot/cherry-pick-5…

…28-to-18.0-fr1 [18.0-fr1] [OSPRH-10956] Fix aodh api timeout default
openstack-k8s-operators · Nov 19, 2024 · 6bcaa73 · 6bcaa73
2 parents 7e172ac + 34c17c9
commit 6bcaa73
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/api/bases/telemetry.openstack.org_autoscalings.yaml b/api/bases/telemetry.openstack.org_autoscalings.yaml
@@ -63,6 +63,7 @@ spec:
                   apiImage:
                     type: string
                   apiTimeout:
+                    default: 60
                     description: APITimeout for Route and Apache
                     minimum: 60
                     type: integer

diff --git a/api/bases/telemetry.openstack.org_telemetries.yaml b/api/bases/telemetry.openstack.org_telemetries.yaml
@@ -66,6 +66,7 @@ spec:
                       apiImage:
                         type: string
                       apiTimeout:
+                        default: 60
                         description: APITimeout for Route and Apache
                         minimum: 60
                         type: integer

diff --git a/api/v1beta1/autoscaling_types.go b/api/v1beta1/autoscaling_types.go
@@ -60,9 +60,9 @@ type Aodh struct {
 type AodhCore struct {
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:validation:Minimum=60
-	// +kubebuilder:Default=60
+	// +kubebuilder:default=60
 	// APITimeout for Route and Apache
-	APITimeout int `json:"apiTimeout,omitempty"`
+	APITimeout int `json:"apiTimeout"`
 
 	// RabbitMQ instance name
 	// Needed to request a transportURL that is created and used in Aodh

diff --git a/config/crd/bases/telemetry.openstack.org_autoscalings.yaml b/config/crd/bases/telemetry.openstack.org_autoscalings.yaml
@@ -63,6 +63,7 @@ spec:
                   apiImage:
                     type: string
                   apiTimeout:
+                    default: 60
                     description: APITimeout for Route and Apache
                     minimum: 60
                     type: integer

diff --git a/config/crd/bases/telemetry.openstack.org_telemetries.yaml b/config/crd/bases/telemetry.openstack.org_telemetries.yaml
@@ -66,6 +66,7 @@ spec:
                       apiImage:
                         type: string
                       apiTimeout:
+                        default: 60
                         description: APITimeout for Route and Apache
                         minimum: 60
                         type: integer