Merge pull request #27 from zzzzhhb/fix_naming_issue

refactor(qrm): keep naming style in line with existing field
kubewharf · Jul 26, 2023 · 3b82238 · 3b82238
2 parents cf744cd + beed8d9
commit 3b82238
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml b/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml
@@ -219,16 +219,6 @@ spec:
                     description: ReclaimedResourceConfig is a configuration for reclaim
                       resource
                     properties:
-                      ReservedResourceForReclaimedCores:
-                        additionalProperties:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                          x-kubernetes-int-or-string: true
-                        description: ReservedResourceForReclaim is a resource reserved
-                          for reclaimed_cores pods.
-                        type: object
                       cpuHeadroomConfig:
                         description: CPUHeadroomConfig is a configuration for cpu
                           headroom
@@ -298,6 +288,16 @@ spec:
                                 type: number
                             type: object
                         type: object
+                      minReclaimedResourceForAllocate:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        description: MinReclaimedResourceForAllocate is a resource
+                          reserved for reclaimed_cores pods.
+                        type: object
                       minReclaimedResourceForReport:
                         additionalProperties:
                           anyOf:

diff --git a/pkg/apis/config/v1alpha1/adminqos.go b/pkg/apis/config/v1alpha1/adminqos.go
@@ -94,9 +94,10 @@ type ReclaimedResourceConfig struct {
 	// +optional
 	ReservedResourceForAllocate *v1.ResourceList `json:"reservedResourceForAllocate,omitempty"`
 
-	// ReservedResourceForReclaim is a resource reserved for reclaimed_cores pods.
+	// MinReclaimedResourceForAllocate is a resource reserved for reclaimed_cores pods，these resources will not be used
+	// by shared_cores pods.
 	// +optional
-	ReservedResourceForReclaimedCores *v1.ResourceList `json:"ReservedResourceForReclaimedCores,omitempty"`
+	MinReclaimedResourceForAllocate *v1.ResourceList `json:"minReclaimedResourceForAllocate,omitempty"`
 
 	// CPUHeadroomConfig is a configuration for cpu headroom
 	// +optional

diff --git a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go