diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index bac2839a304..1e8ac6884c6 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -65,3 +65,6 @@ ENABLE_CLUSTER_DNS=true DNS_SERVER_IP="10.0.0.10" DNS_DOMAIN="kubernetes.local" DNS_REPLICAS=1 + +# Admission Controllers to invoke prior to persisting objects in cluster +ADMISSION_CONTROL=NamespaceAutoProvision,LimitRanger,ResourceQuota diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh index dbce068df5b..13897f39195 100644 --- a/cluster/aws/util.sh +++ b/cluster/aws/util.sh @@ -314,6 +314,7 @@ function kube-up { echo "readonly DNS_REPLICAS='${DNS_REPLICAS:-}'" echo "readonly DNS_SERVER_IP='${DNS_SERVER_IP:-}'" echo "readonly DNS_DOMAIN='${DNS_DOMAIN:-}'" + echo "readonly ADMISSION_CONTROL='${ADMISSION_CONTROL:-}'" grep -v "^#" "${KUBE_ROOT}/cluster/aws/templates/common.sh" grep -v "^#" "${KUBE_ROOT}/cluster/aws/templates/create-dynamic-salt-files.sh" grep -v "^#" "${KUBE_ROOT}/cluster/aws/templates/download-release.sh" diff --git a/cluster/azure/config-default.sh b/cluster/azure/config-default.sh index f7822c4ce4b..38b1f3e7d8b 100644 --- a/cluster/azure/config-default.sh +++ b/cluster/azure/config-default.sh @@ -44,3 +44,6 @@ LOGGING_DESTINATION=elasticsearch # options: elasticsearch, gcp # Optional: When set to true, Elasticsearch and Kibana will be setup as part of the cluster bring up. ENABLE_CLUSTER_LOGGING=false ELASTICSEARCH_LOGGING_REPLICAS=1 + +# Admission Controllers to invoke prior to persisting objects in cluster +ADMISSION_CONTROL=NamespaceAutoProvision,LimitRanger,ResourceQuota diff --git a/cluster/azure/templates/create-dynamic-salt-files.sh b/cluster/azure/templates/create-dynamic-salt-files.sh index 977738b007c..548c6ff2620 100644 --- a/cluster/azure/templates/create-dynamic-salt-files.sh +++ b/cluster/azure/templates/create-dynamic-salt-files.sh @@ -23,6 +23,7 @@ cat </srv/salt-overlay/pillar/cluster-params.sls instance_prefix: '$(echo "$INSTANCE_PREFIX" | sed -e "s/'/''/g")' node_instance_prefix: $NODE_INSTANCE_PREFIX portal_net: $PORTAL_NET +admission_control: '$(echo "$ADMISSION_CONTROL" | sed -e "s/'/''/g")' EOF mkdir -p /srv/salt-overlay/salt/nginx diff --git a/cluster/azure/util.sh b/cluster/azure/util.sh index 40710bd5ab2..c5da546970b 100644 --- a/cluster/azure/util.sh +++ b/cluster/azure/util.sh @@ -349,6 +349,7 @@ function kube-up { echo "readonly SALT_TAR_URL='${SALT_TAR_URL}'" echo "readonly MASTER_HTPASSWD='${htpasswd}'" echo "readonly PORTAL_NET='${PORTAL_NET}'" + echo "readonly ADMISSION_CONTROL='${ADMISSION_CONTROL:-}'" grep -v "^#" "${KUBE_ROOT}/cluster/azure/templates/common.sh" grep -v "^#" "${KUBE_ROOT}/cluster/azure/templates/create-dynamic-salt-files.sh" grep -v "^#" "${KUBE_ROOT}/cluster/azure/templates/download-release.sh"