BackendService and RegionBackendService default values for outlier_de…

…tection subfields removed
pawelJas · Jul 6, 2024 · e8aa72c · e8aa72c
1 parent 2510ab5
commit e8aa72c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 25 deletions.
diff --git a/mmv1/products/compute/BackendService.yaml b/mmv1/products/compute/BackendService.yaml
@@ -962,9 +962,6 @@ properties:
       Settings controlling eviction of unhealthy hosts from the load balancing pool.
       Applicable backend service types can be a global backend service with the
       loadBalancingScheme set to INTERNAL_SELF_MANAGED or EXTERNAL_MANAGED.
-
-      From version 6.0.0 outlierDetection default terraform values will be removed to match default GCP value.
-      Default values are enforce by GCP without providing them.
     properties:
       - !ruby/object:Api::Type::NestedObject
         name: 'baseEjectionTime'
@@ -1011,7 +1008,6 @@ properties:
           - outlier_detection.0.success_rate_minimum_hosts
           - outlier_detection.0.success_rate_request_volume
           - outlier_detection.0.success_rate_stdev_factor
-        default_value: 5
         description: |
           Number of errors before a host is ejected from the connection pool. When the
           backend host is accessed over HTTP, a 5xx return code qualifies as an error.
@@ -1030,7 +1026,6 @@ properties:
           - outlier_detection.0.success_rate_minimum_hosts
           - outlier_detection.0.success_rate_request_volume
           - outlier_detection.0.success_rate_stdev_factor
-        default_value: 5
         description: |
           The number of consecutive gateway failures (502, 503, 504 status or connection
           errors that are mapped to one of those status codes) before a consecutive
@@ -1049,7 +1044,6 @@ properties:
           - outlier_detection.0.success_rate_minimum_hosts
           - outlier_detection.0.success_rate_request_volume
           - outlier_detection.0.success_rate_stdev_factor
-        default_value: 100
         description: |
           The percentage chance that a host will be actually ejected when an outlier
           status is detected through consecutive 5xx. This setting can be used to disable
@@ -1068,7 +1062,6 @@ properties:
           - outlier_detection.0.success_rate_minimum_hosts
           - outlier_detection.0.success_rate_request_volume
           - outlier_detection.0.success_rate_stdev_factor
-        default_value: 0
         description: |
           The percentage chance that a host will be actually ejected when an outlier
           status is detected through consecutive gateway failures. This setting can be
@@ -1087,7 +1080,6 @@ properties:
           - outlier_detection.0.success_rate_minimum_hosts
           - outlier_detection.0.success_rate_request_volume
           - outlier_detection.0.success_rate_stdev_factor
-        default_value: 100
         description: |
           The percentage chance that a host will be actually ejected when an outlier
           status is detected through success rate statistics. This setting can be used to
@@ -1136,7 +1128,6 @@ properties:
           - outlier_detection.0.success_rate_minimum_hosts
           - outlier_detection.0.success_rate_request_volume
           - outlier_detection.0.success_rate_stdev_factor
-        default_value: 10
         description: |
           Maximum percentage of hosts in the load balancing pool for the backend service
           that can be ejected. Defaults to 10%.
@@ -1154,7 +1145,6 @@ properties:
           - outlier_detection.0.success_rate_minimum_hosts
           - outlier_detection.0.success_rate_request_volume
           - outlier_detection.0.success_rate_stdev_factor
-        default_value: 5
         description: |
           The number of hosts in a cluster that must have enough request volume to detect
           success rate outliers. If the number of hosts is less than this setting, outlier
@@ -1174,7 +1164,6 @@ properties:
           - outlier_detection.0.success_rate_minimum_hosts
           - outlier_detection.0.success_rate_request_volume
           - outlier_detection.0.success_rate_stdev_factor
-        default_value: 100
         description: |
           The minimum number of total requests that must be collected in one interval (as
           defined by the interval duration above) to include this host in success rate
@@ -1195,7 +1184,6 @@ properties:
           - outlier_detection.0.success_rate_minimum_hosts
           - outlier_detection.0.success_rate_request_volume
           - outlier_detection.0.success_rate_stdev_factor
-        default_value: 1900
         description: |
           This factor is used to determine the ejection threshold for success rate outlier
           ejection. The ejection threshold is the difference between the mean success

diff --git a/mmv1/products/compute/RegionBackendService.yaml b/mmv1/products/compute/RegionBackendService.yaml
@@ -871,9 +871,6 @@ properties:
       Settings controlling eviction of unhealthy hosts from the load balancing pool.
       This field is applicable only when the `load_balancing_scheme` is set
       to INTERNAL_MANAGED and the `protocol` is set to HTTP, HTTPS, or HTTP2.
-
-      From version 6.0.0 outlierDetection default terraform values will be removed to match default GCP value.
-      Default values are enforce by GCP without providing them.
     properties:
       - !ruby/object:Api::Type::NestedObject
         name: 'baseEjectionTime'
@@ -908,7 +905,6 @@ properties:
               `nanos` field. Must be from 0 to 999,999,999 inclusive.
       - !ruby/object:Api::Type::Integer
         name: 'consecutiveErrors'
-        default_value: 5
         at_least_one_of:
           - outlier_detection.0.base_ejection_time
           - outlier_detection.0.consecutive_errors
@@ -927,7 +923,6 @@ properties:
           Defaults to 5.
       - !ruby/object:Api::Type::Integer
         name: 'consecutiveGatewayFailure'
-        default_value: 5
         at_least_one_of:
           - outlier_detection.0.base_ejection_time
           - outlier_detection.0.consecutive_errors
@@ -946,7 +941,6 @@ properties:
           gateway failure ejection occurs. Defaults to 5.
       - !ruby/object:Api::Type::Integer
         name: 'enforcingConsecutiveErrors'
-        default_value: 100
         at_least_one_of:
           - outlier_detection.0.base_ejection_time
           - outlier_detection.0.consecutive_errors
@@ -965,7 +959,6 @@ properties:
           ejection or to ramp it up slowly. Defaults to 100.
       - !ruby/object:Api::Type::Integer
         name: 'enforcingConsecutiveGatewayFailure'
-        default_value: 0
         at_least_one_of:
           - outlier_detection.0.base_ejection_time
           - outlier_detection.0.consecutive_errors
@@ -984,7 +977,6 @@ properties:
           used to disable ejection or to ramp it up slowly. Defaults to 0.
       - !ruby/object:Api::Type::Integer
         name: 'enforcingSuccessRate'
-        default_value: 100
         at_least_one_of:
           - outlier_detection.0.base_ejection_time
           - outlier_detection.0.consecutive_errors
@@ -1033,7 +1025,6 @@ properties:
               `nanos` field. Must be from 0 to 999,999,999 inclusive.
       - !ruby/object:Api::Type::Integer
         name: 'maxEjectionPercent'
-        default_value: 10
         at_least_one_of:
           - outlier_detection.0.base_ejection_time
           - outlier_detection.0.consecutive_errors
@@ -1051,7 +1042,6 @@ properties:
           that can be ejected. Defaults to 10%.
       - !ruby/object:Api::Type::Integer
         name: 'successRateMinimumHosts'
-        default_value: 5
         at_least_one_of:
           - outlier_detection.0.base_ejection_time
           - outlier_detection.0.consecutive_errors
@@ -1071,7 +1061,6 @@ properties:
           cluster. Defaults to 5.
       - !ruby/object:Api::Type::Integer
         name: 'successRateRequestVolume'
-        default_value: 100
         at_least_one_of:
           - outlier_detection.0.base_ejection_time
           - outlier_detection.0.consecutive_errors
@@ -1092,7 +1081,6 @@ properties:
           to 100.
       - !ruby/object:Api::Type::Integer
         name: 'successRateStdevFactor'
-        default_value: 1900
         at_least_one_of:
           - outlier_detection.0.base_ejection_time
           - outlier_detection.0.consecutive_errors

diff --git a/mmv1/templates/terraform/examples/backend_service_traffic_director_ring_hash.tf.erb b/mmv1/templates/terraform/examples/backend_service_traffic_director_ring_hash.tf.erb
@@ -19,7 +19,15 @@ resource "google_compute_backend_service" "<%= ctx[:primary_resource_id] %>" {
     }
   }
   outlier_detection {
-    consecutive_errors = 2
+    consecutive_errors                    = 2
+    consecutive_gateway_failure           = 5
+    enforcing_consecutive_errors          = 100
+    enforcing_consecutive_gateway_failure = 0
+    enforcing_success_rate                = 100
+    max_ejection_percent                  = 10
+    success_rate_minimum_hosts            = 5
+    success_rate_request_volume           = 100
+    success_rate_stdev_factor             = 1900
   }
 }
 

diff --git a/mmv1/third_party/terraform/website/docs/guides/version_6_upgrade.html.markdown b/mmv1/third_party/terraform/website/docs/guides/version_6_upgrade.html.markdown
@@ -120,8 +120,18 @@ Removed in favor of field `settings.ip_configuration.ssl_mode`.
 
 An empty value means the setting should be cleared.
 
+## Resource: `google_compute_backend_service`
+
+### `outlier_detection` subfields default values removed
+
+Empty values mean the setting should be cleared.
+
 ## Resource: `google_compute_region_backend_service`
 
+### `outlier_detection` subfields default values removed
+
+Empty values mean the setting should be cleared.
+
 ### `connection_draining_timeout_sec` default value changed
 
 An empty value now means 300.