Merge pull request #1546 from openshift-cherrypick-robot/cherry-pick-…

…1540-to-release-4.4 [release-4.4] Bug 1811713: Specify cgroups in kubelet.conf so cAdvisor stats will be tracked
openshift · Mar 11, 2020 · 0f12a6b · 0f12a6b
2 parents 87dfce2 + 0cb2380
commit 0f12a6b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/templates/master/01-master-kubelet/_base/files/kubelet.yaml b/templates/master/01-master-kubelet/_base/files/kubelet.yaml
@@ -11,6 +11,7 @@ contents:
       anonymous:
         enabled: false
     cgroupDriver: systemd
+    cgroupRoot: /
     clusterDNS:
       - {{.ClusterDNSIP}}
     clusterDomain: cluster.local
@@ -19,8 +20,10 @@ contents:
     kubeAPIQPS: 50
     kubeAPIBurst: 100
     rotateCertificates: true
+    runtimeCgroups: /system.slice/crio.service
     serializeImagePulls: false
     staticPodPath: /etc/kubernetes/manifests
+    systemCgroups: /system.slice
     systemReserved:
       cpu: 500m
       memory: 1Gi

diff --git a/templates/worker/01-worker-kubelet/_base/files/kubelet.yaml b/templates/worker/01-worker-kubelet/_base/files/kubelet.yaml
@@ -11,6 +11,7 @@ contents:
       anonymous:
         enabled: false
     cgroupDriver: systemd
+    cgroupRoot: /
     clusterDNS:
       - {{.ClusterDNSIP}}
     clusterDomain: cluster.local
@@ -19,8 +20,10 @@ contents:
     kubeAPIQPS: 50
     kubeAPIBurst: 100
     rotateCertificates: true
+    runtimeCgroups: /system.slice/crio.service
     serializeImagePulls: false
     staticPodPath: /etc/kubernetes/manifests
+    systemCgroups: /system.slice
     systemReserved:
       cpu: 500m
       memory: 1Gi