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

Merge pull request #24749 from andyzheng0831/enhance

Browse Source 
Automatic merge from submit-queue

Trusty: Add retry in curl commands

This fix is for improving robustness in fetch critical metadata files when the metadata server is temporarily unreachable.

@roberthbailey @zmerlynn @dchen1107 please review it.

cc/ @fabioy @wonderfly FYI.
This commit is contained in:
k8s-merge-robot 2016-04-26 13:00:21 -07:00
commit 773bb777f4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/trusty/configure.sh
View File

@ -24,7 +24,7 @@ download_kube_env() {
# Fetch kube-env from GCE metadata server. # Fetch kube-env from GCE metadata server.
readonly tmp_install_dir="/var/cache/kubernetes-install" readonly tmp_install_dir="/var/cache/kubernetes-install"
mkdir -p "${tmp_install_dir}" 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" \ -H "X-Google-Metadata-Request: True" \
-o "${tmp_install_dir}/kube_env.yaml" \ -o "${tmp_install_dir}/kube_env.yaml" \
http://metadata.google.internal/computeMetadata/v1/instance/attributes/kube-env http://metadata.google.internal/computeMetadata/v1/instance/attributes/kube-env

2
cluster/gce/trusty/master.yaml
View File

@ -19,7 +19,7 @@ script
set -o nounset set -o nounset
# Fetch the script for installing master binary and configuration files. # 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" \ -H "X-Google-Metadata-Request: True" \
-o /etc/kube-configure.sh \ -o /etc/kube-configure.sh \
http://metadata.google.internal/computeMetadata/v1/instance/attributes/configure-sh http://metadata.google.internal/computeMetadata/v1/instance/attributes/configure-sh

2
cluster/gce/trusty/node.yaml
View File

@ -19,7 +19,7 @@ script
set -o nounset set -o nounset
# Fetch the script for installing nodes binary and configuration files. # 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" \ -H "X-Google-Metadata-Request: True" \
-o /etc/kube-configure.sh \ -o /etc/kube-configure.sh \
http://metadata.google.internal/computeMetadata/v1/instance/attributes/configure-sh http://metadata.google.internal/computeMetadata/v1/instance/attributes/configure-sh