From 4dd50a18c3ef0dd94b93338dd05e85c0eced8f07 Mon Sep 17 00:00:00 2001
From: derekwaynecarr <decarr@redhat.com>
Date: Fri, 30 Jan 2015 12:16:24 -0500
Subject: [PATCH] Fix vagrant regression, add flag to easily enable v1beta3

---
 cluster/saltbase/salt/kube-apiserver/default | 8 +++++++-
 cluster/vagrant/config-default.sh            | 4 ++++
 cluster/vagrant/provision-master.sh          | 1 +
 cluster/vagrant/util.sh                      | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/cluster/saltbase/salt/kube-apiserver/default b/cluster/saltbase/salt/kube-apiserver/default
index 7cb662ba649..ea15ac288e2 100644
--- a/cluster/saltbase/salt/kube-apiserver/default
+++ b/cluster/saltbase/salt/kube-apiserver/default
@@ -23,6 +23,7 @@
   {% set etcd_servers = "--etcd_servers=http://" + ips[0][0] + ":4001" -%}
 {% endif -%}
 
+{% set cloud_config = "" -%}
 {% if grains.cloud is defined -%}
 {% if grains.cloud == 'gce' -%}
   {% set cloud_provider = "--cloud_provider=gce" -%}
@@ -55,4 +56,9 @@
  {% set admission_control = "--admission_control=" + grains.admission_control -%}
 {% endif -%}
 
-DAEMON_ARGS="{{daemon_args}} {{address}} {{etcd_servers}} {{ cloud_provider }} {{ cloud_config }} {{admission_control}} --allow_privileged={{pillar['allow_privileged']}} {{portal_net}} {{cert_file}} {{key_file}} {{secure_port}} {{token_auth_file}} {{publicAddressOverride}} {{pillar['log_level']}}"
+{% set runtime_config = "" -%}
+{% if grains.runtime_config is defined -%}
+ {% set runtime_config = "--runtime_config=" + grains.runtime_config -%}
+{% endif -%}
+
+DAEMON_ARGS="{{daemon_args}} {{address}} {{etcd_servers}} {{ cloud_provider }} {{ cloud_config }} {{ runtime_config }} {{admission_control}} --allow_privileged={{pillar['allow_privileged']}} {{portal_net}} {{cert_file}} {{key_file}} {{secure_port}} {{token_auth_file}} {{publicAddressOverride}} {{pillar['log_level']}}"
diff --git a/cluster/vagrant/config-default.sh b/cluster/vagrant/config-default.sh
index c0e0bc5267d..bde0db27b23 100755
--- a/cluster/vagrant/config-default.sh
+++ b/cluster/vagrant/config-default.sh
@@ -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"
\ No newline at end of file
diff --git a/cluster/vagrant/provision-master.sh b/cluster/vagrant/provision-master.sh
index 22df0ebf07d..8b51af885fc 100755
--- a/cluster/vagrant/provision-master.sh
+++ b/cluster/vagrant/provision-master.sh
@@ -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
diff --git a/cluster/vagrant/util.sh b/cluster/vagrant/util.sh
index 4e8e54829cc..ac707ca9a78 100644
--- a/cluster/vagrant/util.sh
+++ b/cluster/vagrant/util.sh
@@ -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"