github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-04 07:49:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #78 from jbeda/gcloud-fix

Browse Source 
Fix up version string for gcloud compute version.
This commit is contained in:
brendandburns
2014-06-12 11:37:56 -07:00
parent 880059fb8a 9d50a76922
commit df3aa48f88
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/kube-up.sh
View File

@@ -96,9 +96,9 @@ for (( i=0; i<${#MINION_NAMES[@]}; i++)); do
--can-ip-forward \ --can-ip-forward \
--metadata-from-file startup-script=${KUBE_TEMP}/minion-start-${i}.sh & --metadata-from-file startup-script=${KUBE_TEMP}/minion-start-${i}.sh &
# 'gcloud compute' past 2014.06.08 breaks the way we are specifying # 'gcloud compute' past 2014.06.11 breaks the way we are specifying
# --next-hop-instance and there is no way to be compatible with both versions. # --next-hop-instance and there is no way to be compatible with both versions.
if [[ $GCLOUD_VERSION < "2014.06.08" ]]; then if [[ $GCLOUD_VERSION < "2014.06.11" ]]; then
gcloud compute routes create ${MINION_NAMES[$i]} \ gcloud compute routes create ${MINION_NAMES[$i]} \
--project ${PROJECT} \ --project ${PROJECT} \
--destination-range ${MINION_IP_RANGES[$i]} \ --destination-range ${MINION_IP_RANGES[$i]} \