github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-22 01:23:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12591 from dchen1107/automated-cherry-pick-of-#12541-upstream-release-1.0

Browse Source 
Automated cherry pick of #12541
This commit is contained in:
Zach Loafman
2015-08-19 16:25:13 -07:00
parent 353014bf34 15afc98c83
commit 6db3e8ee78
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cluster/gce/util.sh
View File

@@ -1006,10 +1006,11 @@ function prepare-push() {
# being used, create a temp one, then delete the old one and recreate it once again.
create-node-instance-template "tmp"
gcloud compute instance-groups managed --zone "${ZONE}" \
set-template "${NODE_INSTANCE_PREFIX}-group" \
--project "${PROJECT}" \
--template "${NODE_INSTANCE_PREFIX}-template-tmp" || true;
gcloud compute instance-groups managed \
set-instance-template "${NODE_INSTANCE_PREFIX}-group" \
--template "${NODE_INSTANCE_PREFIX}-template-tmp" \
--zone "${ZONE}" \
--project "${PROJECT}" || true;
gcloud compute instance-templates delete \
--project "${PROJECT}" \
@@ -1018,10 +1019,11 @@ function prepare-push() {
create-node-instance-template
gcloud compute instance-groups managed --zone "${ZONE}" \
set-template "${NODE_INSTANCE_PREFIX}-group" \
--project "${PROJECT}" \
--template "${NODE_INSTANCE_PREFIX}-template" || true;
gcloud compute instance-groups managed \
set-instance-template "${NODE_INSTANCE_PREFIX}-group" \
--template "${NODE_INSTANCE_PREFIX}-template" \
--zone "${ZONE}" \
--project "${PROJECT}" || true;
gcloud compute instance-templates delete \
--project "${PROJECT}" \