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

…32-to-18.0-fr1 [18.0-fr1] [OSPRH-10956] Remove minimum from APITimeout
openstack-k8s-operators · Nov 19, 2024 · bcbd902 · bcbd902
2 parents 6bcaa73 + f2e6ff8
commit bcbd902
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 10 deletions.
diff --git a/api/bases/telemetry.openstack.org_autoscalings.yaml b/api/bases/telemetry.openstack.org_autoscalings.yaml
@@ -65,7 +65,6 @@ spec:
                   apiTimeout:
                     default: 60
                     description: APITimeout for Route and Apache
-                    minimum: 60
                     type: integer
                   customServiceConfig:
                     default: '# add your customization here'

diff --git a/api/bases/telemetry.openstack.org_ceilometers.yaml b/api/bases/telemetry.openstack.org_ceilometers.yaml
@@ -111,7 +111,6 @@ spec:
               apiTimeout:
                 default: 60
                 description: APITimeout for Apache
-                minimum: 60
                 type: integer
               centralImage:
                 type: string

diff --git a/api/bases/telemetry.openstack.org_telemetries.yaml b/api/bases/telemetry.openstack.org_telemetries.yaml
@@ -68,7 +68,6 @@ spec:
                       apiTimeout:
                         default: 60
                         description: APITimeout for Route and Apache
-                        minimum: 60
                         type: integer
                       customServiceConfig:
                         default: '# add your customization here'
@@ -429,7 +428,6 @@ spec:
                   apiTimeout:
                     default: 60
                     description: APITimeout for Apache
-                    minimum: 60
                     type: integer
                   centralImage:
                     type: string

diff --git a/api/v1beta1/autoscaling_types.go b/api/v1beta1/autoscaling_types.go
@@ -59,7 +59,6 @@ type Aodh struct {
 // Aodh defines the aodh component spec
 type AodhCore struct {
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:validation:Minimum=60
 	// +kubebuilder:default=60
 	// APITimeout for Route and Apache
 	APITimeout int `json:"apiTimeout"`

diff --git a/api/v1beta1/ceilometer_types.go b/api/v1beta1/ceilometer_types.go
@@ -72,7 +72,6 @@ type CeilometerSpec struct {
 type CeilometerSpecCore struct {
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=60
-	// +kubebuilder:validation:Minimum=60
 	// APITimeout for Apache
 	APITimeout int `json:"apiTimeout"`
 

diff --git a/config/crd/bases/telemetry.openstack.org_autoscalings.yaml b/config/crd/bases/telemetry.openstack.org_autoscalings.yaml
@@ -65,7 +65,6 @@ spec:
                   apiTimeout:
                     default: 60
                     description: APITimeout for Route and Apache
-                    minimum: 60
                     type: integer
                   customServiceConfig:
                     default: '# add your customization here'

diff --git a/config/crd/bases/telemetry.openstack.org_ceilometers.yaml b/config/crd/bases/telemetry.openstack.org_ceilometers.yaml
@@ -111,7 +111,6 @@ spec:
               apiTimeout:
                 default: 60
                 description: APITimeout for Apache
-                minimum: 60
                 type: integer
               centralImage:
                 type: string

diff --git a/config/crd/bases/telemetry.openstack.org_telemetries.yaml b/config/crd/bases/telemetry.openstack.org_telemetries.yaml
@@ -68,7 +68,6 @@ spec:
                       apiTimeout:
                         default: 60
                         description: APITimeout for Route and Apache
-                        minimum: 60
                         type: integer
                       customServiceConfig:
                         default: '# add your customization here'
@@ -429,7 +428,6 @@ spec:
                   apiTimeout:
                     default: 60
                     description: APITimeout for Apache
-                    minimum: 60
                     type: integer
                   centralImage:
                     type: string