backport of commit 42e4b7d

hashicorp · Aug 29, 2023 · 178aae9 · 178aae9
1 parent 4f71d82
commit 178aae9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/charts/consul/templates/crd-ingressgateways.yaml b/charts/consul/templates/crd-ingressgateways.yaml
@@ -87,13 +87,14 @@ spec:
                         description: The base time that a host is ejected for. The
                           real time is equal to the base time multiplied by the number
                           of times the host has been ejected and is capped by max_ejection_time
-                          (Default 300s). Defaults to 30000ms or 30s.
+                          (Default 300s). Defaults to 30s.
                         type: string
                       enforcingConsecutive5xx:
                         description: EnforcingConsecutive5xx is the % chance that
                           a host will be actually ejected when an outlier status is
                           detected through consecutive 5xx. This setting can be used
-                          to disable ejection or to ramp it up slowly.
+                          to disable ejection or to ramp it up slowly. Ex. Setting this to
+                          10 will make it a 10% chance that the host will be ejected.
                         format: int32
                         type: integer
                       interval:
@@ -201,14 +202,15 @@ spec:
                                   for. The real time is equal to the base time multiplied
                                   by the number of times the host has been ejected
                                   and is capped by max_ejection_time (Default 300s).
-                                  Defaults to 30000ms or 30s.
+                                  Defaults to 30s.
                                 type: string
                               enforcingConsecutive5xx:
                                 description: EnforcingConsecutive5xx is the % chance
                                   that a host will be actually ejected when an outlier
                                   status is detected through consecutive 5xx. This
                                   setting can be used to disable ejection or to ramp
-                                  it up slowly.
+                                  it up slowly. Ex. Setting this to 10 will make it a 
+                                  10% chance that the host will be ejected.
                                 format: int32
                                 type: integer
                               interval:

diff --git a/control-plane/api/v1alpha1/servicedefaults_types.go b/control-plane/api/v1alpha1/servicedefaults_types.go
@@ -186,7 +186,7 @@ type PassiveHealthCheck struct {
 	MaxEjectionPercent *uint32 `json:"maxEjectionPercent,omitempty"`
 	// The base time that a host is ejected for. The real time is equal to the base time
 	// multiplied by the number of times the host has been ejected and is capped by
-	// max_ejection_time (Default 300s). Defaults to 30000ms or 30s.
+	// max_ejection_time (Default 300s). Defaults to 30s.
 	BaseEjectionTime *metav1.Duration `json:"baseEjectionTime,omitempty"`
 }