Merge pull request #17621 from mikedanese/cleanup-kube-proxy-cgroup

Auto commit by PR queue bot
2015-11-23 15:23:23 -08:00
parent b38836c1e0 65b8d43543
commit 367f0e03dd
5 changed files with 3 additions and 9 deletions
--- a/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest
+++ b/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest
@@ -29,7 +29,7 @@ spec:
    command:
    - /bin/sh
    - -c
-    - kube-proxy {{api_servers_with_port}} {{kubeconfig}} {{pillar['log_level']}} {{test_args}} 1>>/var/log/kube-proxy.log 2>&1
+    - kube-proxy {{api_servers_with_port}} {{kubeconfig}} --resource-container="" {{pillar['log_level']}} {{test_args}} 1>>/var/log/kube-proxy.log 2>&1
    securityContext:
      privileged: true
    volumeMounts: