From 5a302f58a9a7eca9fd8bb5cb69f93d1c54e1ee3d Mon Sep 17 00:00:00 2001
From: Richard Brown <rbrownccb@opensuse.org>
Date: Thu, 13 Sep 2018 17:41:50 +0200
Subject: [PATCH] Package fixes for enabling br_netfilter & ip_forward with
 kubeadm (kubeadm#1062)

---
 build/rpms/50-kubeadm.conf | 2 ++
 build/rpms/kubeadm.conf    | 2 ++
 build/rpms/kubeadm.spec    | 7 +++++++
 3 files changed, 11 insertions(+)
 create mode 100644 build/rpms/50-kubeadm.conf
 create mode 100644 build/rpms/kubeadm.conf

diff --git a/build/rpms/50-kubeadm.conf b/build/rpms/50-kubeadm.conf
new file mode 100644
index 0000000000..a5d977316d
--- /dev/null
+++ b/build/rpms/50-kubeadm.conf
@@ -0,0 +1,2 @@
+# The file is provided as part of the kubeadm package
+net.ipv4.ip_forward = 1
diff --git a/build/rpms/kubeadm.conf b/build/rpms/kubeadm.conf
new file mode 100644
index 0000000000..4b3e02da8c
--- /dev/null
+++ b/build/rpms/kubeadm.conf
@@ -0,0 +1,2 @@
+# Load br_netfilter module at boot
+br_netfilter
diff --git a/build/rpms/kubeadm.spec b/build/rpms/kubeadm.spec
index b38ecdfb9b..c05109a3fd 100644
--- a/build/rpms/kubeadm.spec
+++ b/build/rpms/kubeadm.spec
@@ -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