fix(tide): fix fields typo

config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml

@@ -257,25 +257,18 @@ spec:
                               try to evict some pods. For example: "100000", "10%".'
                             pattern: ^(0|[1-9]\d*)(\.\d+)?%?$|^\d+$
                             type: string
-                          podMinimumUsedThreshold:
-                            description: 'PodMinimumUsedThreshold is a threshold for
-                              all pods. The eviction manager will ignore this pod
-                              if its rootfs used in bytes is lower than this threshold.
-                              For example: "200Gi", "1%".'
-                            pattern: ^(0|[1-9][0-9]*)(\.[0-9]+)?%?$|^(0|[1-9][0-9]*)([kKmMGTPeE]i?)$
-                            type: string
                           podMinimumInodesUsedThreshold:
                             description: 'PodMinimumInodesUsedThreshold is a threshold
                               for all pods. The eviction manager will ignore this
                               pod if its rootfs inodes used is lower than this threshold.
                               For example: "1000", "1%".'
                             pattern: ^(0|[1-9]\d*)(\.\d+)?%?$|^\d+$
                             type: string
-                          reclaimedQoSPodUsedPriorityThreshold:
-                            description: 'ReclaimedQoSPodUsedPriorityThreshold is
-                              a threshold for all offline pods. The eviction manager
-                              will prioritize the eviction of offline pods that reach
-                              this threshold. For example: "100Gi", "1%".'
+                          podMinimumUsedThreshold:
+                            description: 'PodMinimumUsedThreshold is a threshold for
+                              all pods. The eviction manager will ignore this pod
+                              if its rootfs used in bytes is lower than this threshold.
+                              For example: "200Gi", "1%".'
                             pattern: ^(0|[1-9][0-9]*)(\.[0-9]+)?%?$|^(0|[1-9][0-9]*)([kKmMGTPeE]i?)$
                             type: string
                           reclaimedQoSPodInodesUsedPriorityThreshold:
@@ -285,6 +278,13 @@ spec:
                               reach this threshold. For example: "500", "1%".'
                             pattern: ^(0|[1-9]\d*)(\.\d+)?%?$|^\d+$
                             type: string
+                          reclaimedQoSPodUsedPriorityThreshold:
+                            description: 'ReclaimedQoSPodUsedPriorityThreshold is
+                              a threshold for all offline pods. The eviction manager
+                              will prioritize the eviction of offline pods that reach
+                              this threshold. For example: "100Gi", "1%".'
+                            pattern: ^(0|[1-9][0-9]*)(\.[0-9]+)?%?$|^(0|[1-9][0-9]*)([kKmMGTPeE]i?)$
+                            type: string
                         type: object
                       systemLoadPressureEvictionConfig:
                         description: SystemLoadPressureEvictionConfig is the config

config/crd/bases/tide.katalyst.kubewharf.io_tidenodepools.yaml

@@ -43,7 +43,7 @@ spec:
                 properties:
                   type:
                     type: string
-                  waterFlow:
+                  watermark:
                     properties:
                       evictOfflinePodTaint:
                         properties:

pkg/apis/tide/v1alpha1/types.go

@@ -32,16 +32,16 @@ type TideNodePoolSpec struct {
 type EvictStrategy struct {
 	Type string `json:"type"`
 	// +optional
-	WaterFlow WaterFlow `json:"waterFlow,omitempty"`
+	Watermark Watermark `json:"watermark,omitempty"`
 }
 
 type EvictStrategyType string
 
 const (
-	WaterFlowStrategy EvictStrategyType = "water-flow"
+	WatermarkStrategy EvictStrategyType = "watermark"
 )
 
-type WaterFlow struct {
+type Watermark struct {
 	// +optional
 	EvictOnlinePodTaint *TaintOption `json:"evictOnlinePodTaint,omitempty"`
 	// +optional
@@ -87,12 +87,12 @@ type TideNodePoolStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 	// +optional
-	ReverseNodes ReverseNodes `json:"reverseNodes,omitempty"`
+	ReserveNodes ReserveNodes `json:"reverseNodes,omitempty"`
 	// +optional
 	TideNodes TideNodes `json:"tideNodes,omitempty"`
 }
 
-type ReverseNodes struct {
+type ReserveNodes struct {
 	OnlineNodes  []string `json:"onlineNodes,omitempty"`
 	OfflineNodes []string `json:"offlineNodes,omitempty"`
 }