Enable common set of admission controllers across salt providers

This commit is contained in:
derekwaynecarr
2015-03-06 15:41:13 -05:00
parent 6d465c4d86
commit 468bf1da75
9 changed files with 102 additions and 4 deletions

View File

@@ -49,7 +49,7 @@ MASTER_USER=vagrant
MASTER_PASSWD=vagrant
# Admission Controllers to invoke prior to persisting objects in cluster
ADMISSION_CONTROL=NamespaceExists,LimitRanger,ResourceQuota,AlwaysAdmit
ADMISSION_CONTROL=NamespaceAutoProvision,LimitRanger,ResourceQuota
# Optional: Install node monitoring.
ENABLE_NODE_MONITORING=true

View File

@@ -83,7 +83,6 @@ grains:
cloud_provider: vagrant
roles:
- kubernetes-master
admission_control: '$(echo "$ADMISSION_CONTROL" | sed -e "s/'/''/g")'
runtime_config: '$(echo "$RUNTIME_CONFIG" | sed -e "s/'/''/g")'
EOF
@@ -102,6 +101,7 @@ cat <<EOF >/srv/salt-overlay/pillar/cluster-params.sls
dns_server: '$(echo "$DNS_SERVER_IP" | sed -e "s/'/''/g")'
dns_domain: '$(echo "$DNS_DOMAIN" | sed -e "s/'/''/g")'
instance_prefix: '$(echo "$INSTANCE_PREFIX" | sed -e "s/'/''/g")'
admission_control: '$(echo "$ADMISSION_CONTROL" | sed -e "s/'/''/g")'
EOF
# Configure the salt-master