Expose CPUManager policy and set reservations

itskoko · Mar 9, 2018 · 59a283b · 59a283b
1 parent a8ca715
commit 59a283b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/kubernetes.yaml b/kubernetes.yaml
@@ -46,6 +46,10 @@ Parameters:
     Type: String
     Default: ""
 
+  WorkerCPUManagerPolicy:
+    Type: String
+    Default: "none"
+
   KubeadmVersion:
     Type: String
     Default: v1.9.2
@@ -1204,13 +1208,14 @@ Resources:
         - assetBucket: !Ref assetBucket
           DomainName:  !Ref DomainName
       Parameters:
-        DomainName:     !Ref DomainName
-        FeatureGates:   !Ref WorkerFeatureGates
-        assetBucket:    !Ref assetBucket
-        VPCID:          !Ref VPCID
-        PrivateSubnetA: !Ref PrivateSubnetA
-        PrivateSubnetB: !Ref PrivateSubnetB
-        PrivateSubnetC:      !Ref PrivateSubnetC
+        DomainName:       !Ref DomainName
+        FeatureGates:     !Ref WorkerFeatureGates
+        CPUManagerPolicy: !Ref WorkerCPUManagerPolicy
+        assetBucket:      !Ref assetBucket
+        VPCID:            !Ref VPCID
+        PrivateSubnetA:   !Ref PrivateSubnetA
+        PrivateSubnetB:   !Ref PrivateSubnetB
+        PrivateSubnetC:   !Ref PrivateSubnetC
 
 Outputs:
   ControllerRole:

diff --git a/templates/worker.yaml b/templates/worker.yaml
@@ -24,6 +24,11 @@ Parameters:
     Type: String
     Default: ""
 
+  CPUManagerPolicy:
+    Description: cpu manager policy for kubelet
+    Type: String
+    Default: "none"
+
   WorkerInstanceType:
     Description: EC2 instance type for controller nodes.
     Type: String
@@ -92,6 +97,9 @@ Mappings:
           --cluster-domain=${KUBELET_CLUSTER_DOMAIN} \
           --register-with-taints=${KUBELET_TAINTS} \
           --feature-gates=${KUBELET_FEATURE_GATES} \
+          --cpu-manager-policy=${KUBELET_CPU_MANAGER_POLICY} \
+          --kube-reserved=cpu=100m \
+          --system-reserved=cpu=100m \
           --allow-privileged
         ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid
         [Install]
@@ -298,10 +306,12 @@ Resources:
                       KUBELET_CLUSTER_DOMAIN=${DomainName}
                       KUBELET_TAINTS=${Taints}
                       KUBELET_FEATURE_GATES=${FeatureGates}
+                      KUBELET_CPU_MANAGER_POLICY=${CPUManagerPolicy}
                     - KubeletImageTag: !Ref KubeletImageTag
                       DomainName: !Ref DomainName
                       Taints: !Ref Taints
                       FeatureGates: !Ref FeatureGates
+                      CPUManagerPolicy: !Ref CPUManagerPolicy
               cloudProviderConfig:
                 Fn::Base64:
                   Fn::Sub: