Fix vagrant regression, add flag to easily enable v1beta3

This commit is contained in:
derekwaynecarr
2015-01-30 12:16:24 -05:00
parent 922148acd8
commit 4dd50a18c3
4 changed files with 13 additions and 1 deletions

View File

@@ -66,3 +66,7 @@ ENABLE_CLUSTER_DNS=true
DNS_SERVER_IP="10.247.0.10"
DNS_DOMAIN="kubernetes.local"
DNS_REPLICAS=1
# Optional: Enable setting flags for kube-apiserver to turn on behavior in active-dev
RUNTIME_CONFIG=""
#RUNTIME_CONFIG="api/v1beta3"

View File

@@ -76,6 +76,7 @@ grains:
roles:
- kubernetes-master
admission_control: AlwaysAdmit
runtime_config: '$(echo "$RUNTIME_CONFIG" | sed -e "s/'/''/g")'
EOF
mkdir -p /srv/salt-overlay/pillar

View File

@@ -78,6 +78,7 @@ function create-provision-scripts {
echo "ENABLE_CLUSTER_DNS='${ENABLE_CLUSTER_DNS:-false}'"
echo "DNS_SERVER_IP='${DNS_SERVER_IP:-}'"
echo "DNS_DOMAIN='${DNS_DOMAIN:-}'"
echo "RUNTIME_CONFIG='${RUNTIME_CONFIG:-}'"
grep -v "^#" "${KUBE_ROOT}/cluster/vagrant/provision-master.sh"
) > "${KUBE_TEMP}/master-start.sh"