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()

pkg/util/procfs/procfs.go

@@ -24,10 +24,10 @@ import (
 	"strings"
 )
 
-type ProcFs struct{}
+type ProcFS struct{}
 
-func NewProcFs() ProcFsInterface {
+func NewProcFS() ProcFSInterface {
-	return &ProcFs{}
+	return &ProcFS{}
 }
 
 func containerNameFromProcCgroup(content string) (string, error) {
@@ -44,7 +44,7 @@ func containerNameFromProcCgroup(content string) (string, error) {
 // getFullContainerName gets the container name given the root process id of the container.
 // Eg. If the devices cgroup for the container is stored in /sys/fs/cgroup/devices/docker/nginx,
 // return docker/nginx. Assumes that the process is part of exactly one cgroup hierarchy.
-func (pfs *ProcFs) GetFullContainerName(pid int) (string, error) {
+func (pfs *ProcFS) GetFullContainerName(pid int) (string, error) {
 	filePath := path.Join("/proc", strconv.Itoa(pid), "cgroup")
 	content, err := ioutil.ReadFile(filePath)
 	if err != nil {

pkg/util/procfs/procfs_fake.go

@@ -16,15 +16,15 @@ limitations under the License.
 
 package procfs
 
-type FakeProcFs struct{}
+type FakeProcFS struct{}
 
-func NewFakeProcFs() ProcFsInterface {
+func NewFakeProcFS() ProcFSInterface {
-	return &FakeProcFs{}
+	return &FakeProcFS{}
 }
 
-// getFullContainerName gets the container name given the root process id of the container.
+// GetFullContainerName gets the container name given the root process id of the container.
 // Eg. If the devices cgroup for the container is stored in /sys/fs/cgroup/devices/docker/nginx,
 // return docker/nginx. Assumes that the process is part of exactly one cgroup hierarchy.
-func (fakePfs *FakeProcFs) GetFullContainerName(pid int) (string, error) {
+func (fakePfs *FakeProcFS) GetFullContainerName(pid int) (string, error) {
 	return "", nil
 }

pkg/util/procfs/procfs_interface.go

@@ -16,7 +16,7 @@ limitations under the License.
 
 package procfs
 
-type ProcFsInterface interface {
+type ProcFSInterface interface {
-	// getFullContainerName gets the container name given the root process id of the container.
+	// GetFullContainerName gets the container name given the root process id of the container.
 	GetFullContainerName(pid int) (string, error)
 }

pkg/util/sysctl/sysctl.go

@@ -27,9 +27,14 @@ const (
 	sysctlBase         = "/proc/sys"
 	VmOvercommitMemory = "vm/overcommit_memory"
 	VmPanicOnOOM       = "vm/panic_on_oom"
+	KernelPanic        = "kernel/panic"
+	KernelPanicOnOops  = "kernel/panic_on_oops"
 
 	VmOvercommitMemoryAlways    = 1 // kernel performs no memory over-commit handling
 	VmPanicOnOOMInvokeOOMKiller = 0 // kernel calls the oom_killer function when OOM occurs
+
+	KernelPanicOnOopsAlways  = 1  // kernel panics on kernel oops
+	KernelPanicRebootTimeout = 10 // seconds after a panic for the kernel to reboot
 )
 
 // GetSysctl returns the value for the specified sysctl setting