From 5ae56ce5549392d159c669ffe22e5df9bbfd074e Mon Sep 17 00:00:00 2001
From: James DeFelice <james@mesosphere.io>
Date: Tue, 5 Jan 2016 01:24:27 +0000
Subject: [PATCH] disable conntrack behavior mods that are possibly causing
 smoke tests to bomb

---
 contrib/mesos/pkg/minion/server.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/contrib/mesos/pkg/minion/server.go b/contrib/mesos/pkg/minion/server.go
index 3eee739ac1c..7db66981a11 100644
--- a/contrib/mesos/pkg/minion/server.go
+++ b/contrib/mesos/pkg/minion/server.go
@@ -139,6 +139,11 @@ func (ms *MinionServer) launchProxyServer() {
 		"--logtostderr=true",
 		"--resource-container=" + path.Join("/", ms.mesosCgroup, "kube-proxy"),
 		"--proxy-mode=" + ms.proxyMode,
+		// TODO(jdef) this is a temporary hack to fix failing smoke tests. a following PR
+		// will more properly fix the smoke tests as well as make these flags configrable
+		// at the framework level (as opposed to hardcoded here)
+		"--conntrack-max=0",
+		"--conntrack-tcp-timeout-established=0",
 	}
 
 	if ms.clientConfig.Host != "" {