add failure threshold

Signed-off-by: mingzhou.swx <[email protected]>
openkruise · Nov 10, 2022 · 82179f2 · 82179f2
1 parent ec4e74a
commit 82179f2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/api/v1alpha1/batchrelease_plan_types.go b/api/v1alpha1/batchrelease_plan_types.go
@@ -45,8 +45,7 @@ type ReleasePlan struct {
 	// RolloutID indicates an id for each rollout progress
 	RolloutID string `json:"rolloutID,omitempty"`
 	// FailureThreshold indicates how many failed pods can be tolerated in all upgraded pods.
-	// Only when both batch FailureThreshold and Canary.FailureThreshold are satisfied, Rollout
-	// can enter ready state.
+	// Only when FailureThreshold are satisfied, Rollout can enter ready state.
 	// If FailureThreshold is nil, Rollout will use the MaxUnavailable of workload as its
 	// FailureThreshold.
 	// Defaults to nil.

diff --git a/api/v1alpha1/rollout_types.go b/api/v1alpha1/rollout_types.go
@@ -97,8 +97,7 @@ type CanaryStrategy struct {
 	// todo current only support one TrafficRouting
 	TrafficRoutings []*TrafficRouting `json:"trafficRoutings,omitempty"`
 	// FailureThreshold indicates how many failed pods can be tolerated in all upgraded pods.
-	// Only when both batch FailureThreshold and Canary.FailureThreshold are satisfied, Rollout
-	// can enter ready state.
+	// Only when FailureThreshold are satisfied, Rollout can enter ready state.
 	// If FailureThreshold is nil, Rollout will use the MaxUnavailable of workload as its
 	// FailureThreshold.
 	// Defaults to nil.

diff --git a/config/crd/bases/rollouts.kruise.io_batchreleases.yaml b/config/crd/bases/rollouts.kruise.io_batchreleases.yaml
@@ -97,11 +97,10 @@ spec:
                     - type: integer
                     - type: string
                     description: FailureThreshold indicates how many failed pods can
-                      be tolerated in all upgraded pods. Only when both batch FailureThreshold
-                      and Canary.FailureThreshold are satisfied, Rollout can enter
-                      ready state. If FailureThreshold is nil, Rollout will use the
-                      MaxUnavailable of workload as its FailureThreshold. Defaults
-                      to nil.
+                      be tolerated in all upgraded pods. Only when FailureThreshold
+                      are satisfied, Rollout can enter ready state. If FailureThreshold
+                      is nil, Rollout will use the MaxUnavailable of workload as its
+                      FailureThreshold. Defaults to nil.
                     x-kubernetes-int-or-string: true
                   rolloutID:
                     description: RolloutID indicates an id for each rollout progress

diff --git a/config/crd/bases/rollouts.kruise.io_rollouts.yaml b/config/crd/bases/rollouts.kruise.io_rollouts.yaml
@@ -97,11 +97,10 @@ spec:
                         - type: integer
                         - type: string
                         description: FailureThreshold indicates how many failed pods
-                          can be tolerated in all upgraded pods. Only when both batch
-                          FailureThreshold and Canary.FailureThreshold are satisfied,
-                          Rollout can enter ready state. If FailureThreshold is nil,
-                          Rollout will use the MaxUnavailable of workload as its FailureThreshold.
-                          Defaults to nil.
+                          can be tolerated in all upgraded pods. Only when FailureThreshold
+                          are satisfied, Rollout can enter ready state. If FailureThreshold
+                          is nil, Rollout will use the MaxUnavailable of workload
+                          as its FailureThreshold. Defaults to nil.
                         x-kubernetes-int-or-string: true
                       steps:
                         description: Steps define the order of phases to execute release