add predict overcommit ratio key consts

kubewharf · Jul 8, 2024 · a9666d7 · a9666d7
1 parent be552fd
commit a9666d7
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 14 deletions.
diff --git a/config/crd/bases/overcommit.katalyst.kubewharf.io_nodeovercommitconfigs.yaml b/config/crd/bases/overcommit.katalyst.kubewharf.io_nodeovercommitconfigs.yaml
@@ -45,6 +45,11 @@ spec:
           spec:
             description: NodeOvercommitConfigSpec is a description of a NodeOvercommitConfig
             properties:
+              enableDynamicOvercommit:
+                description: enableDynamicOvercommit determines whether to use the
+                  dynamic overcommitment automatically calculated by Katalyst as the
+                  overcommitment actually applied to the node.
+                type: boolean
               nodeOvercommitSelectorVal:
                 description: NodeOvercommitSelectorVal is the value of node label
                   selector with key consts.NodeOvercommitSelectorKey, it decides whether

diff --git a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/overcommit/v1alpha1/types.go b/pkg/apis/overcommit/v1alpha1/types.go
@@ -32,6 +32,10 @@ type NodeOvercommitConfigSpec struct {
 	// cpu,memory are supported.
 	// +optional
 	ResourceOvercommitRatio map[v1.ResourceName]string `json:"resourceOvercommitRatio,omitempty"`
+
+	// enableDynamicOvercommit determines whether to use the dynamic overcommitment automatically calculated by Katalyst as the overcommitment actually applied to the node.
+	// +optional
+	EnableDynamicOvercommit bool `json:"enableDynamicOvercommit"`
 }
 
 type NodeOvercommitConfigStatus struct {

diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go
diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go
diff --git a/pkg/consts/overcommit.go b/pkg/consts/overcommit.go
@@ -22,6 +22,8 @@ const (
 	NodeAnnotationMemoryOvercommitRatioKey         = "katalyst.kubewharf.io/memory_overcommit_ratio"
 	NodeAnnotationRealtimeCPUOvercommitRatioKey    = "katalyst.kubewharf.io/realtime_cpu_overcommit_ratio"
 	NodeAnnotationRealtimeMemoryOvercommitRatioKey = "katalyst.kubewharf.io/realtime_memory_overcommit_ratio"
+	NodeAnnotationPredictCPUOvercommitRatioKey     = "katalyst.kubewharf.io/predict_cpu_overcommit_ratio"
+	NodeAnnotationPredictMemoryOvercommitRatioKey  = "katalyst.kubewharf.io/predict_memory_overcommit_ratio"
 
 	NodeAnnotationOriginalCapacityCPUKey       = "katalyst.kubewharf.io/original_capacity_cpu"
 	NodeAnnotationOriginalCapacityMemoryKey    = "katalyst.kubewharf.io/original_capacity_memory"