mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #19277 from mesosphere/jdef-fix-broken-smoke-with-fudged-kubeproxy-flags
Auto commit by PR queue bot
This commit is contained in:
commit
e0eac06f64
@ -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 != "" {
|
||||
|
Loading…
Reference in New Issue
Block a user