Merge branch 'rbac-kp' into rbac-script-cert

2017-06-20 00:54:43 -04:00 · 2017-06-20 00:54:43 -04:00 · d2131a8652
commit d2131a8652
parent e58d06ddd1 ba41d3ee55
1 changed files with 0 additions and 3 deletions
--- a/roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
+++ b/roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
@ -25,10 +25,7 @@ spec:
    - /hyperkube
    - proxy
    - --v={{ kube_log_level }}
-    - --master={{ kube_apiserver_endpoint }}
-{% if not is_kube_master %}
    - --kubeconfig={{kube_config_dir}}/kube-proxy-kubeconfig.yaml
-{% endif %}
    - --bind-address={{ ip | default(ansible_default_ipv4.address) }}
    - --cluster-cidr={{ kube_pods_subnet }}
    - --proxy-mode={{ kube_proxy_mode }}