epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-14 13:54:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into standalone_kubelet

Browse Source
This commit is contained in:
Antoine Legrand
2016-12-13 17:26:21 +01:00
committed by GitHub
parent c75f394707 33585fa673
commit 26e3142c95
33 changed files with 849 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
View File

@@ -48,6 +48,9 @@ spec:
- --cloud-config={{ kube_config_dir }}/cloud_config
{% elif cloud_provider is defined and cloud_provider == "aws" %}
- --cloud-provider={{ cloud_provider }}
{% endif %}
{% if kube_api_anonymous_auth is defined and kube_version | version_compare('v1.5', '>=') %}
- --anonymous-auth={{ kube_api_anonymous_auth }}
{% endif %}
livenessProbe:
httpGet: