Fix CPU FS quota and its defaulting

kubernetes-sigs · Apr 7, 2023 · 0034707 · 0034707
1 parent 87ee33a
commit 0034707
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
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
@@ -150,6 +151,8 @@ spec:
                     description: SystemReserved contains resources reserved for OS
                       system daemons and kernel memory.
                     type: object
+                required:
+                - cpuCFSQuota
                 type: object
               machineTemplateRef:
                 description: MachineTemplateRef is a reference to an object that defines

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
@@ -150,6 +151,8 @@ spec:
                     description: SystemReserved contains resources reserved for OS
                       system daemons and kernel memory.
                     type: object
+                required:
+                - cpuCFSQuota
                 type: object
               labels:
                 additionalProperties:

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

diff --git a/pkg/controllers/state/informer/provisioner.go b/pkg/controllers/state/informer/provisioner.go
@@ -49,7 +49,7 @@ func (c *ProvisionerController) Name() string {
 	return "provisioner_state"
 }
 
-func (c *ProvisionerController) Reconcile(_ context.Context, _ *v1alpha5.Provisioner) (reconcile.Result, error) {
+func (c *ProvisionerController) Reconcile(_ context.Context, p *v1alpha5.Provisioner) (reconcile.Result, error) {
 	// Something changed in the provisioner so we should re-consider consolidation
 	c.cluster.SetConsolidated(false)
 	return reconcile.Result{}, nil

diff --git a/pkg/scheduling/volumeusage.go b/pkg/scheduling/volumeusage.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"fmt"
 
-	"k8s.io/csi-translation-lib"
+	csitranslation "k8s.io/csi-translation-lib"
 	"knative.dev/pkg/logging"
 
 	v1 "k8s.io/api/core/v1"