Merge pull request #348 from rsmitty/master

updated admission controllers for >1.2 Kubernetes
This commit is contained in:
Smaine Kahlouch 2016-07-08 23:08:32 +02:00 committed by GitHub
commit c1690c91c2

View file

@ -33,7 +33,7 @@ KUBE_ETCD_SERVERS="--etcd_servers={% for host in groups['etcd'] %}http://{{ host
KUBE_API_ADDRESS="--bind-address={{ ip | default(ansible_default_ipv4.address) }}" KUBE_API_ADDRESS="--bind-address={{ ip | default(ansible_default_ipv4.address) }}"
# default admission control policies # default admission control policies
KUBE_ADMISSION_CONTROL="--admission_control=NamespaceLifecycle,NamespaceExists,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota" KUBE_ADMISSION_CONTROL="--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota"
# RUNTIME API CONFIGURATION (e.g. enable extensions) # RUNTIME API CONFIGURATION (e.g. enable extensions)
KUBE_RUNTIME_CONFIG="{% if kube_api_runtime_config is defined %}{% for conf in kube_api_runtime_config %}--runtime-config={{ conf }} {% endfor %}{% endif %}" KUBE_RUNTIME_CONFIG="{% if kube_api_runtime_config is defined %}{% for conf in kube_api_runtime_config %}--runtime-config={{ conf }} {% endfor %}{% endif %}"