Fix CPU FS quota and its defaulting

kubernetes-sigs · Apr 5, 2023 · ee5bc82 · ee5bc82
1 parent 87ee33a
commit ee5bc82
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/pkg/apis/crds/karpenter.sh_machines.yaml b/pkg/apis/crds/karpenter.sh_machines.yaml
@@ -68,6 +68,7 @@ spec:
                       with your worker nodes.
                     type: string
                   cpuCFSQuota:
+                    default: true
                     description: CPUCFSQuota enables CPU CFS quota enforcement for
                       containers that specify CPU limits.
                     type: boolean

diff --git a/pkg/apis/crds/karpenter.sh_provisioners.yaml b/pkg/apis/crds/karpenter.sh_provisioners.yaml
@@ -68,6 +68,7 @@ spec:
                       with your worker nodes.
                     type: string
                   cpuCFSQuota:
+                    default: true
                     description: CPUCFSQuota enables CPU CFS quota enforcement for
                       containers that specify CPU limits.
                     type: boolean

diff --git a/pkg/apis/v1alpha5/machine.go b/pkg/apis/v1alpha5/machine.go
@@ -102,8 +102,9 @@ type KubeletConfiguration struct {
 	// +optional
 	ImageGCLowThresholdPercent *int32 `json:"imageGCLowThresholdPercent,omitempty"`
 	// CPUCFSQuota enables CPU CFS quota enforcement for containers that specify CPU limits.
+	// +kubebuilder:default=true
 	// +optional
-	CPUCFSQuota bool `json:"cpuCFSQuota,omitempty"`
+	CPUCFSQuota *bool `json:"cpuCFSQuota,omitempty"`
 }
 
 type MachineTemplateRef struct {

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