Merge pull request #53386 from wwwtyro/rye/fail-swap-on

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. default fail-swap-on to false for kubelet on kubernetes-worker charm **What this PR does / why we need it**: default fail-swap-on to false for kubelet on kubernetes-worker charm **Release note**: ```release-note default fail-swap-on to false for kubelet on kubernetes-worker charm ```

Merge pull request #53386 from wwwtyro/rye/fail-swap-on
2fec911a · Kubernetes Submit Queue · GitHub · 2bf7a20a · 4b839465 · 2fec911a
Commit 2fec911a authored Oct 03, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

kubernetes_worker.py ...ju/layers/kubernetes-worker/reactive/kubernetes_worker.py +1 -0

No files found.
--- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
+++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
@@ -487,6 +487,7 @@ def configure_worker_services(api_servers, dns, cluster_cidr):
    kubelet_opts.add('tls-cert-file', server_cert_path)
    kubelet_opts.add('tls-private-key-file', server_key_path)
    kubelet_opts.add('logtostderr', 'true')
+    kubelet_opts.add('fail-swap-on', 'false')
    kube_proxy_opts = FlagManager('kube-proxy')
    kube_proxy_opts.add('cluster-cidr', cluster_cidr)