Merge pull request kubernetes#1475 from rphillips/add_sysctls

OCPBUGS-7555: UPSTREAM: <carry>: add default kubelet sysctls within rpm

Author: openshift-merge-robot

openshift-hack/sysctls/50-kubelet.conf

@@ -0,0 +1,6 @@
+kernel.keys.root_maxbytes=25000000
+kernel.keys.root_maxkeys=1000000
+kernel.panic=10
+kernel.panic_on_oops=1
+vm.overcommit_memory=1
+vm.panic_on_oom=0

openshift.spec

@@ -107,6 +107,7 @@ KUBE_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} make all WHAT='cmd/kube-
 
 PLATFORM="$(go env GOHOSTOS)/$(go env GOHOSTARCH)"
 install -d %{buildroot}%{_bindir}
+install -d %{buildroot}%{_sysctldir}
 
 # Install linux components
 for bin in kube-apiserver kube-controller-manager kube-scheduler kubelet
@@ -117,6 +118,10 @@ done
 
 install -p -m 755 openshift-hack/images/hyperkube/hyperkube %{buildroot}%{_bindir}/hyperkube
 install -p -m 755 openshift-hack/images/hyperkube/kubensenter %{buildroot}%{_bindir}/kubensenter
+install -p -m 755 openshift-hack/sysctls/50-kubelet.conf %{buildroot}%{_sysctldir}/50-kubelet.conf
+
+%post
+%sysctl_apply 50-kubelet.conf
 
 %files hyperkube
 %license LICENSE
@@ -126,6 +131,7 @@ install -p -m 755 openshift-hack/images/hyperkube/kubensenter %{buildroot}%{_bin
 %{_bindir}/kube-scheduler
 %{_bindir}/kubelet
 %{_bindir}/kubensenter
+%{_sysctldir}/50-kubelet.conf
 %defattr(-,root,root,0700)
 
 %changelog