github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3981 from derekwaynecarr/salt_flag_v1beta3

Browse Source 
Fix vagrant regression, add flag to easily enable v1beta3
This commit is contained in:
Brendan Burns 2015-01-30 09:21:40 -08:00
commit ac2f435aca
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/saltbase/salt/kube-apiserver/default
View File

@ -23,6 +23,7 @@
{% set etcd_servers = "--etcd_servers=http://" + ips[0][0] + ":4001" -%} {% set etcd_servers = "--etcd_servers=http://" + ips[0][0] + ":4001" -%}
{% endif -%} {% endif -%}
{% set cloud_config = "" -%}
{% if grains.cloud is defined -%} {% if grains.cloud is defined -%}
{% if grains.cloud == 'gce' -%} {% if grains.cloud == 'gce' -%}
{% set cloud_provider = "--cloud_provider=gce" -%} {% set cloud_provider = "--cloud_provider=gce" -%}
@ -55,4 +56,9 @@
{% set admission_control = "--admission_control=" + grains.admission_control -%} {% set admission_control = "--admission_control=" + grains.admission_control -%}
{% endif -%} {% 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']}}"

4
cluster/vagrant/config-default.sh
View File

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

1
cluster/vagrant/provision-master.sh
View File

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

1
cluster/vagrant/util.sh
View File

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