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

Merge pull request #12384 from Hokutosei/master

Browse Source 
added preemptible flag in gcloud compute instance-templates create
This commit is contained in:
Alex Robinson 2015-08-10 11:08:11 -07:00
commit 34f164a470
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/gce/config-default.sh
View File

@ -26,6 +26,7 @@ MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20GB}
MINION_DISK_TYPE=pd-standard MINION_DISK_TYPE=pd-standard
MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB} MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB}
REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true} REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true}
PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false}
OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150806} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150806}

1
cluster/gce/config-test.sh
View File

@ -27,6 +27,7 @@ MINION_DISK_TYPE=pd-standard
MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB} MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB}
REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false} REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false}
KUBE_APISERVER_REQUEST_TIMEOUT=300 KUBE_APISERVER_REQUEST_TIMEOUT=300
PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false}
OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150806} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150806}

5
cluster/gce/util.sh
View File

@ -398,6 +398,10 @@ function create-node-template {
fi fi
local attempt=1 local attempt=1
local preemptible_minions=""
if [[ "${PREEMPTIBLE_MINION}" == "true" ]]; then
preemptible_minions="--preemptible --maintenance-policy TERMINATE"
fi
while true; do while true; do
echo "Attempt ${attempt} to create ${1}" >&2 echo "Attempt ${attempt} to create ${1}" >&2
if ! gcloud compute instance-templates create "$1" \ if ! gcloud compute instance-templates create "$1" \
@ -409,6 +413,7 @@ function create-node-template {
--image "${MINION_IMAGE}" \ --image "${MINION_IMAGE}" \
--tags "${MINION_TAG}" \ --tags "${MINION_TAG}" \
--network "${NETWORK}" \ --network "${NETWORK}" \
${preemptible_minions} \
$2 \ $2 \
--can-ip-forward \ --can-ip-forward \
--metadata-from-file "$3","$4" >&2; then --metadata-from-file "$3","$4" >&2; then