fix: adjust the structure and rename some fields

Author: youngLiuHY

config/crd/rollout/rollout.kusionstack.io_rolloutstrategies.yaml

@@ -4564,32 +4564,6 @@ spec:
                   - targets
                   type: object
                 type: array
-              toleration:
-                description: Toleration is the toleration policy of the canary strategy
-                properties:
-                  initialDelaySeconds:
-                    description: Number of seconds after the toleration check has started before the task are initiated.
-                    format: int32
-                    type: integer
-                  taskFailureThreshold:
-                    anyOf:
-                    - type: integer
-                    - type: string
-                    description: |-
-                      FailureThreshold indicates how many failed pods can be tolerated before marking the rollout task as success
-                      If not set, the default value is 0, which means no failed pods can be tolerated
-                      This is a task level threshold.
-                    x-kubernetes-int-or-string: true
-                  workloadTotalFailureThreshold:
-                    anyOf:
-                    - type: integer
-                    - type: string
-                    description: |-
-                      WorkloadFailureThreshold indicates how many failed pods can be tolerated in all upgraded pods of one workload.
-                      The default value is 0, which means no failed pods can be tolerated.
-                      This is a workload level threshold.
-                    x-kubernetes-int-or-string: true
-                type: object
             type: object
           canary:
             description: Canary defines the canary strategy for upgrade and operation

rollout/v1alpha1/rolloutstrategy_types.go

@@ -82,11 +82,7 @@ type BatchStrategy struct {
 // BatchStrategyV2 defines the v2 batch strategy
 type BatchStrategyV2 struct {
 	// Batches define the order of phases to execute release in canary release
-	Batches []RolloutBatchStep `json:"batches,omitempty"`
-
-	// Toleration is the toleration policy of the canary strategy
-	// +optional
-	Toleration *TolerationStrategy `json:"toleration,omitempty"`
+	Batches []RolloutBatchStrategyStep `json:"batches,omitempty"`
 }
 
 // TolerationStrategy defines the toleration strategy
@@ -134,9 +130,9 @@ type RolloutStep struct {
 	Properties map[string]string `json:"properties,omitempty"`
 }
 
-type RolloutBatchStep struct {
+type RolloutBatchStrategyStep struct {
 	// rollout targets defines desired target replicas
-	Targets []RolloutTargets `json:"targets"`
+	Targets []RolloutStrategyTargets `json:"targets"`
 
 	// traffic strategy
 	// +optional
@@ -174,7 +170,7 @@ type CanaryStrategy struct {
 
 type CanaryStrategyV2 struct {
 	// rollout targets defines desired target replicas
-	Targets []RolloutTargets `json:"targets"`
+	Targets []RolloutStrategyTargets `json:"targets"`
 
 	// traffic strategy
 	// +optional
@@ -189,7 +185,7 @@ type CanaryStrategyV2 struct {
 	TemplateMetadataPatch *MetadataPatch `json:"templateMetadataPatch,omitempty"`
 }
 
-type RolloutTargets struct {
+type RolloutStrategyTargets struct {
 	// Replicas is the replicas of the rollout task, which represents the number of pods to be upgraded
 	Replicas intstr.IntOrString `json:"replicas"`