github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #68624 from sysrich/crio_support 

Package fixes for enabling br_netfilter & ip_forward with kubeadm
pull/58/head
k8s-ci-robot 2018-09-25 17:00:26 -07:00 committed by GitHub
parent 450fdc9c09 5a302f58a9
commit 8c4d37ece5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/rpms/50-kubeadm.conf Normal file
View File

@ -0,0 +1,2 @@
# The file is provided as part of the kubeadm package
net.ipv4.ip_forward = 1

2
build/rpms/kubeadm.conf Normal file
View File

@ -0,0 +1,2 @@
# Load br_netfilter module at boot
br_netfilter

7
build/rpms/kubeadm.spec
View File

@ -21,8 +21,15 @@ install -m 755 -d %{buildroot}%{_sysconfdir}/sysconfig/
install -p -m 755 -t %{buildroot}%{_bindir} {kubeadm}
install -p -m 755 -t %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/ {10-kubeadm.conf}
install -p -m 755 -T {kubelet.env} %{buildroot}%{_sysconfdir}/sysconfig/kubelet
mkdir -p %{buildroot}%{_libexecdir}/modules-load.d
mkdir -p %{buildroot}%{_sysctldir}
install -p -m 0644 -t %{buildroot}%{_libexecdir}/modules-load.d/ {kubeadm.conf}
install -p -m 0644 -t %{buildroot}%{_sysctldir} %{50-kubeadm.conf}
%files
%{_bindir}/kubeadm
%{_sysconfdir}/systemd/system/kubelet.service.d/10-kubeadm.conf
%{_sysconfdir}/sysconfig/kubelet
%dir %{_libexecdir}/modules-load.d
%{_libexecdir}/modules-load.d/kubeadm.conf
%{_sysctldir}/50-kubeadm.conf