From 8175c17a008b29953e2351d7fc32cf91c508f193 Mon Sep 17 00:00:00 2001
From: Matt Rickard <mrick@google.com>
Date: Tue, 18 Jul 2017 14:43:56 -0700
Subject: [PATCH] Use kubenet, add ebtables support

Fixes #1568
---
 cmd/minikube/cmd/root.go                      |  1 +
 .../board/coreos/minikube/linux-4.9_defconfig | 23 ++++++++++++++++++-
 .../minikube-iso/configs/minikube_defconfig   |  1 +
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/cmd/minikube/cmd/root.go b/cmd/minikube/cmd/root.go
index 55998e73f7..d6ab5e01d4 100644
--- a/cmd/minikube/cmd/root.go
+++ b/cmd/minikube/cmd/root.go
@@ -152,5 +152,6 @@ func setupViper() {
 	viper.SetDefault(config.WantReportError, false)
 	viper.SetDefault(config.WantReportErrorPrompt, true)
 	viper.SetDefault(config.WantKubectlDownloadMsg, true)
+	viper.SetDefault("network-plugin", "kubenet")
 	setFlagsUsingViper()
 }
diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/linux-4.9_defconfig b/deploy/iso/minikube-iso/board/coreos/minikube/linux-4.9_defconfig
index 355ba382bf..b8ef2111aa 100644
--- a/deploy/iso/minikube-iso/board/coreos/minikube/linux-4.9_defconfig
+++ b/deploy/iso/minikube-iso/board/coreos/minikube/linux-4.9_defconfig
@@ -125,6 +125,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_XT_SET=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -188,7 +189,6 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_SET=m
 CONFIG_IP_SET=y
 CONFIG_IP_SET_HASH_IP=m
 CONFIG_IP_SET_LIST_SET=m
@@ -210,6 +210,27 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=y
 CONFIG_IP6_NF_FILTER=y
 CONFIG_IP6_NF_TARGET_REJECT=y
 CONFIG_IP6_NF_MANGLE=y
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
 CONFIG_BRIDGE=m
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_INGRESS=m
diff --git a/deploy/iso/minikube-iso/configs/minikube_defconfig b/deploy/iso/minikube-iso/configs/minikube_defconfig
index fa20c31af5..7ad9049fdb 100644
--- a/deploy/iso/minikube-iso/configs/minikube_defconfig
+++ b/deploy/iso/minikube-iso/configs/minikube_defconfig
@@ -24,6 +24,7 @@ BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_BRIDGE_UTILS=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_IPTABLES=y
+BR2_PACKAGE_EBTABLES=y
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_SOCAT=y
 BR2_PACKAGE_NFS_UTILS=y