Merge pull request #91 from cheney-lin/dev/cpuprovision

chore: refine control knob constraints

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

@@ -82,30 +82,26 @@ spec:
                               constraints:
                                 items:
                                   properties:
-                                    name:
-                                      description: ControlKnobName defines available
-                                        control knob key for provision policy
-                                      type: string
-                                    restrictControlKnobMaxLowerGap:
-                                      description: RestrictControlKnobMaxUpperGap
-                                        is the maximum downward offset value from
-                                        the baseline
+                                    maxLowerGap:
+                                      description: MaxLowerGap is the maximum downward
+                                        offset value from the baseline
                                       type: number
-                                    restrictControlKnobMaxLowerGapRatio:
-                                      description: RestrictControlKnobMaxUpperGap
-                                        is the maximum downward offset ratio from
-                                        the baseline
+                                    maxLowerGapRatio:
+                                      description: MaxLowerGapRatio is the maximum
+                                        downward offset ratio from the baseline
                                       type: number
-                                    restrictControlKnobMaxUpperGap:
-                                      description: RestrictControlKnobMaxUpperGap
-                                        is the maximum upward offset value from the
-                                        baseline
+                                    maxUpperGap:
+                                      description: MaxUpperGap is the maximum upward
+                                        offset value from the baseline
                                       type: number
-                                    restrictControlKnobMaxUpperGapRatio:
-                                      description: RestrictControlKnobMaxUpperGap
-                                        is the maximum upward offset ratio from the
-                                        baseline
+                                    maxUpperGapRatio:
+                                      description: MaxUpperGapRatio is the maximum
+                                        upward offset ratio from the baseline
                                       type: number
+                                    name:
+                                      description: ControlKnobName defines available
+                                        control knob key for provision policy
+                                      type: string
                                   required:
                                   - name
                                   type: object

pkg/apis/config/v1alpha1/adminqos.go

@@ -177,16 +177,20 @@ type IndicatorTargetConfiguration struct {
 	Target float64                             `json:"target"`
 }
 
+type RestrictConstraints struct {
+	// MaxUpperGap is the maximum upward offset value from the baseline
+	MaxUpperGap *float64 `json:"maxUpperGap,omitempty"`
+	// MaxLowerGap is the maximum downward offset value from the baseline
+	MaxLowerGap *float64 `json:"maxLowerGap,omitempty"`
+	// MaxUpperGapRatio is the maximum upward offset ratio from the baseline
+	MaxUpperGapRatio *float64 `json:"maxUpperGapRatio,omitempty"`
+	// MaxLowerGapRatio is the maximum downward offset ratio from the baseline
+	MaxLowerGapRatio *float64 `json:"maxLowerGapRatio,omitempty"`
+}
+
 type ControlKnobConstraints struct {
-	Name ControlKnobName `json:"name"`
-	// RestrictControlKnobMaxUpperGap is the maximum upward offset value from the baseline
-	RestrictControlKnobMaxUpperGap *float64 `json:"restrictControlKnobMaxUpperGap,omitempty"`
-	// RestrictControlKnobMaxUpperGap is the maximum downward offset value from the baseline
-	RestrictControlKnobMaxLowerGap *float64 `json:"restrictControlKnobMaxLowerGap,omitempty"`
-	// RestrictControlKnobMaxUpperGap is the maximum upward offset ratio from the baseline
-	RestrictControlKnobMaxUpperGapRatio *float64 `json:"restrictControlKnobMaxUpperGapRatio,omitempty"`
-	// RestrictControlKnobMaxUpperGap is the maximum downward offset ratio from the baseline
-	RestrictControlKnobMaxLowerGapRatio *float64 `json:"restrictControlKnobMaxLowerGapRatio,omitempty"`
+	Name                ControlKnobName     `json:"name"`
+	RestrictConstraints RestrictConstraints `json:",inline"`
 }
 
 type CPUProvisionConfig struct {