From b929ba01ef945b674db5c7f1cc83b45f53dc2d4c Mon Sep 17 00:00:00 2001 From: Ashwani Khemani Date: Thu, 27 Sep 2018 20:11:45 -0500 Subject: [PATCH 1/2] changes done to enable br_filter and ip_forward for debian packages --- build/debs/50-kubeadm.conf | 2 ++ build/debs/BUILD | 10 ++++++++++ build/debs/kubeadm.conf | 2 ++ 3 files changed, 14 insertions(+) create mode 100644 build/debs/50-kubeadm.conf create mode 100644 build/debs/kubeadm.conf diff --git a/build/debs/50-kubeadm.conf b/build/debs/50-kubeadm.conf new file mode 100644 index 0000000000000..a5d977316dd42 --- /dev/null +++ b/build/debs/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/debs/BUILD b/build/debs/BUILD index b89dbe1b303a4..04365afecd0ac 100644 --- a/build/debs/BUILD +++ b/build/debs/BUILD @@ -78,6 +78,16 @@ deb_data( "mode": "644", "dir": "/etc/systemd/system/kubelet.service.d", }, + { + "files": ["kubeadm.conf"], + "mode": "644", + "dir": "/usr/lib/modules-load.d", + }, + { + "files": ["50-kubeadm.conf"], + "mode": "644", + "dir": "/etc/sysctl.d/50-kubeadm.conf", + } ], ) diff --git a/build/debs/kubeadm.conf b/build/debs/kubeadm.conf new file mode 100644 index 0000000000000..4b3e02da8cceb --- /dev/null +++ b/build/debs/kubeadm.conf @@ -0,0 +1,2 @@ +# Load br_netfilter module at boot +br_netfilter From a7ecb562b38d35d8df28beac268a4c5d540a223c Mon Sep 17 00:00:00 2001 From: Ashwani Khemani Date: Thu, 25 Oct 2018 10:57:24 -0500 Subject: [PATCH 2/2] changes for update-bazel script --- build/debs/BUILD | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build/debs/BUILD b/build/debs/BUILD index 04365afecd0ac..4237e92739d3f 100644 --- a/build/debs/BUILD +++ b/build/debs/BUILD @@ -78,16 +78,16 @@ deb_data( "mode": "644", "dir": "/etc/systemd/system/kubelet.service.d", }, - { - "files": ["kubeadm.conf"], - "mode": "644", - "dir": "/usr/lib/modules-load.d", - }, - { - "files": ["50-kubeadm.conf"], - "mode": "644", - "dir": "/etc/sysctl.d/50-kubeadm.conf", - } + { + "files": ["kubeadm.conf"], + "mode": "644", + "dir": "/usr/lib/modules-load.d", + }, + { + "files": ["50-kubeadm.conf"], + "mode": "644", + "dir": "/etc/sysctl.d", + }, ], )