Merge pull request kubernetes#24871 from andyzheng0831/automated-cher…

…ry-pick-of-#24749-upstream-release-1.2 Automatic merge from submit-queue Automated cherry pick of kubernetes#24749 Cherry pick of kubernetes#24749 on release-1.2.
shyamjvs · Apr 27, 2016 · 0fe9a44 · 0fe9a44
2 parents 65e1d9b + 276b7c0
commit 0fe9a44
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cluster/gce/trusty/configure.sh b/cluster/gce/trusty/configure.sh
@@ -24,7 +24,7 @@ download_kube_env() {
   # Fetch kube-env from GCE metadata server.
   readonly tmp_install_dir="/var/cache/kubernetes-install"
   mkdir -p "${tmp_install_dir}"
-  curl --fail --silent --show-error \
+  curl --fail --retry 5 --retry-delay 3 --silent --show-error \
     -H "X-Google-Metadata-Request: True" \
     -o "${tmp_install_dir}/kube_env.yaml" \
     http://metadata.google.internal/computeMetadata/v1/instance/attributes/kube-env

diff --git a/cluster/gce/trusty/master.yaml b/cluster/gce/trusty/master.yaml
@@ -19,7 +19,7 @@ script
 	set -o nounset
 
 	# Fetch the script for installing master binary and configuration files.
-	curl --fail --silent --show-error \
+	curl --fail --retry 5 --retry-delay 3 --silent --show-error \
 		-H "X-Google-Metadata-Request: True" \
 		-o /etc/kube-configure.sh \
 		http://metadata.google.internal/computeMetadata/v1/instance/attributes/configure-sh

diff --git a/cluster/gce/trusty/node.yaml b/cluster/gce/trusty/node.yaml
@@ -19,7 +19,7 @@ script
 	set -o nounset
 
 	# Fetch the script for installing nodes binary and configuration files.
-	curl --fail --silent --show-error \
+	curl --fail --retry 5 --retry-delay 3 --silent --show-error \
 		-H "X-Google-Metadata-Request: True" \
 		-o /etc/kube-configure.sh \
 		http://metadata.google.internal/computeMetadata/v1/instance/attributes/configure-sh