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

This commit is contained in:
Raj Perera 2017-06-20 00:54:43 -04:00
commit d2131a8652

View file

@ -25,10 +25,7 @@ spec:
- /hyperkube - /hyperkube
- proxy - proxy
- --v={{ kube_log_level }} - --v={{ kube_log_level }}
- --master={{ kube_apiserver_endpoint }}
{% if not is_kube_master %}
- --kubeconfig={{kube_config_dir}}/kube-proxy-kubeconfig.yaml - --kubeconfig={{kube_config_dir}}/kube-proxy-kubeconfig.yaml
{% endif %}
- --bind-address={{ ip | default(ansible_default_ipv4.address) }} - --bind-address={{ ip | default(ansible_default_ipv4.address) }}
- --cluster-cidr={{ kube_pods_subnet }} - --cluster-cidr={{ kube_pods_subnet }}
- --proxy-mode={{ kube_proxy_mode }} - --proxy-mode={{ kube_proxy_mode }}