Merge pull request #17202 from brendandburns/fix2

Auto commit by PR queue bot

pkg/kubelet/cm/container_manager_linux.go

@@ -147,6 +147,8 @@ func setupKernelTunables(option KernelTunableBehavior) error {
 	desiredState := map[string]int{
 		utilsysctl.VmOvercommitMemory: utilsysctl.VmOvercommitMemoryAlways,
 		utilsysctl.VmPanicOnOOM:       utilsysctl.VmPanicOnOOMInvokeOOMKiller,
+		utilsysctl.KernelPanic:        utilsysctl.KernelPanicRebootTimeout,
+		utilsysctl.KernelPanicOnOops:  utilsysctl.KernelPanicOnOopsAlways,
 	}
 
 	errList := []error{}

pkg/kubelet/dockertools/fake_manager.go

@@ -44,7 +44,7 @@ func NewFakeDockerManager(
 	httpClient kubetypes.HttpGetter, imageBackOff *util.Backoff) *DockerManager {
 
 	fakeOOMAdjuster := oom.NewFakeOOMAdjuster()
-	fakeProcFs := procfs.NewFakeProcFs()
+	fakeProcFs := procfs.NewFakeProcFS()
 	dm := NewDockerManager(client, recorder, livenessManager, containerRefManager, machineInfo, podInfraContainerImage, qps,
 		burst, containerLogsDir, osInterface, networkPlugin, generator, httpClient, &NativeExecHandler{},
 		fakeOOMAdjuster, fakeProcFs, false, imageBackOff, true)

pkg/kubelet/dockertools/manager.go

@@ -133,7 +133,7 @@ type DockerManager struct {
 	oomAdjuster *oom.OOMAdjuster
 
 	// Get information from /proc mount.
-	procFs procfs.ProcFsInterface
+	procFs procfs.ProcFSInterface
 
 	// If true, enforce container cpu limits with CFS quota support
 	cpuCFSQuota bool
@@ -158,7 +158,7 @@ func NewDockerManager(
 	httpClient kubetypes.HttpGetter,
 	execHandler ExecHandler,
 	oomAdjuster *oom.OOMAdjuster,
-	procFs procfs.ProcFsInterface,
+	procFs procfs.ProcFSInterface,
 	cpuCFSQuota bool,
 	imageBackOff *util.Backoff,
 	serializeImagePulls bool) *DockerManager {

pkg/kubelet/kubelet.go

@@ -334,7 +334,7 @@ func NewMainKubelet(
 		return nil, err
 	}
 
-	procFs := procfs.NewProcFs()
+	procFs := procfs.NewProcFS()
 	imageBackOff := util.NewBackOff(resyncInterval, MaxContainerBackOff)
 
 	klet.livenessManager = proberesults.NewManager()