Merge pull request #6210 from mmerrill3/feature/kops-4049

Fixing kops-4049

nodeup/pkg/model/kubelet.go

@@ -268,6 +268,8 @@ func (b *KubeletBuilder) buildSystemdService() *nodetasks.Service {
 	manifest.Set("Service", "StartLimitInterval", "0")
 	manifest.Set("Service", "KillMode", "process")
 	manifest.Set("Service", "User", "root")
+	manifest.Set("Service", "CPUAccounting", "true")
+	manifest.Set("Service", "MemoryAccounting", "true")
 	manifestString := manifest.Render()
 
 	glog.V(8).Infof("Built service manifest %q\n%s", "kubelet", manifestString)

nodeup/pkg/model/kubelet_test.go

@@ -191,6 +191,15 @@ func Test_RunKubeletBuilder(t *testing.T) {
 		context.AddTask(task)
 	}
 
+	{
+		task := builder.buildSystemdService()
+		if err != nil {
+			t.Fatalf("error from KubeletBuilder buildSystemdService: %v", err)
+			return
+		}
+		context.AddTask(task)
+	}
+
 	testutils.ValidateTasks(t, basedir, context)
 }
 

nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml

@@ -7,3 +7,25 @@ contents: |
   HOME="/root"
 path: /etc/sysconfig/kubelet
 type: file
+---
+Name: kubelet.service
+definition: |
+  [Unit]
+  Description=Kubernetes Kubelet Server
+  Documentation=https://github.com/kubernetes/kubernetes
+  After=docker.service
+
+  [Service]
+  EnvironmentFile=/etc/sysconfig/kubelet
+  ExecStart=/usr/local/bin/kubelet "$DAEMON_ARGS"
+  Restart=always
+  RestartSec=2s
+  StartLimitInterval=0
+  KillMode=process
+  User=root
+  CPUAccounting=true
+  MemoryAccounting=true
+enabled: true
+manageState: true
+running: true
+smartRestart: true