Skip to content

K
k3s
Commit e0eac06f authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #19277 from mesosphere/jdef-fix-broken-smoke-with-fudged-kubeproxy-flags

Auto commit by PR queue bot
parents 071fd284 5ae56ce5
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
contrib/mesos/pkg/minion/server.go
View file @ e0eac06f
...@@ -139,6 +139,11 @@ func (ms *MinionServer) launchProxyServer() { ...@@ -139,6 +139,11 @@ func (ms *MinionServer) launchProxyServer() {
"--logtostderr=true", "--logtostderr=true",
"--resource-container=" + path.Join("/", ms.mesosCgroup, "kube-proxy"), "--resource-container=" + path.Join("/", ms.mesosCgroup, "kube-proxy"),
"--proxy-mode=" + ms.proxyMode, "--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 != "" { if ms.clientConfig.Host != "" {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment