packet: Add --cpu-manager-policy to kubelet

This add flag to worker pools, also added a knob for user to configure it. closes: #1337 Signed-off-by: knrt10 <[email protected]>
kinvolk · Mar 1, 2021 · c7db768 · c7db768
1 parent 87e9c0d
commit c7db768
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 64 deletions.
diff --git a/assets/terraform-modules/packet/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl b/assets/terraform-modules/packet/flatcar-linux/kubernetes/workers/cl/worker.yaml.tmpl
@@ -98,6 +98,7 @@ systemd:
           --cloud-provider=external \
           --cni-conf-dir=/etc/cni/net.d \
           --config=/etc/kubernetes/kubelet.config \
+          --cpu-manager-policy=${cpu_manager_policy} \
           --exit-on-lock-contention \
           %{~ if enable_tls_bootstrap ~}
           --kubeconfig=/var/lib/kubelet/kubeconfig \

diff --git a/assets/terraform-modules/packet/flatcar-linux/kubernetes/workers/variables.tf b/assets/terraform-modules/packet/flatcar-linux/kubernetes/workers/variables.tf
@@ -195,3 +195,9 @@ variable "enable_tls_bootstrap" {
   description = "Enable TLS Bootstrap for Kubelet."
   type        = bool
 }
+
+variable "cpu_manager_policy" {
+  description = "CPU Manager policy to use for. Possible values: `none`, `static` for --cpu-manager-policy flag in kubelet."
+  default     = "none"
+  type        = string
+}
diff --git a/assets/terraform-modules/packet/flatcar-linux/kubernetes/workers/workers.tf b/assets/terraform-modules/packet/flatcar-linux/kubernetes/workers/workers.tf
@@ -59,7 +59,7 @@ data "ct_config" "ignitions" {
       cluster_domain_suffix = var.cluster_domain_suffix
       node_labels = merge({
         "node.kubernetes.io/node"                 = "",
-        "lokomotive.alpha.kinvolk.io/bgp-enabled" = format("%t", !var.disable_bgp),
+        "lokomotive.alpha.kinvolk.io/bgp-enabled" = format("%t", ! var.disable_bgp),
       }, var.labels)
       taints               = var.taints
       setup_raid           = var.setup_raid
@@ -69,6 +69,7 @@ data "ct_config" "ignitions" {
       cluster_name         = var.cluster_name
       dns_zone             = var.dns_zone
       enable_tls_bootstrap = var.enable_tls_bootstrap
+      cpu_manager_policy   = var.cpu_manager_policy
     }
   )
   platform = "packet"

diff --git a/docs/configuration-reference/platforms/packet.md b/docs/configuration-reference/platforms/packet.md
diff --git a/pkg/assets/generated_assets.go b/pkg/assets/generated_assets.go
diff --git a/pkg/platform/packet/packet.go b/pkg/platform/packet/packet.go
@@ -46,6 +46,7 @@ const (
 type workerPool struct {
 	Name                  string            `hcl:"pool_name,label"`
 	Count                 int               `hcl:"count"`
+	CPUManagerPolicy      string            `hcl:"cpu_manager_policy,optional"`
 	DisableBGP            bool              `hcl:"disable_bgp,optional"`
 	IPXEScriptURL         string            `hcl:"ipxe_script_url,optional"`
 	OSArch                string            `hcl:"os_arch,optional"`

diff --git a/pkg/platform/packet/template.go b/pkg/platform/packet/template.go
@@ -151,6 +151,8 @@ EOF
 
   cluster_name = "{{$.Config.ClusterName}}"
 
+  cpu_manager_policy = "{{$pool.CPUManagerPolicy}}"
+
   {{- if $pool.Tags }}
   tags = [
       {{- range $key, $value := $pool.Tags }}