fix clear containers cc-proxy #2686
Conversation
ghost
assigned
parts/k8s/kubernetescustomscript.sh
Outdated
| @@ -229,7 +233,7 @@ function installContainerd() { | |||
| CRI_CONTAINERD_VERSION="1.1.0-rc.0" | |||
| local download_uri="https://storage.googleapis.com/cri-containerd-release/cri-containerd-${CRI_CONTAINERD_VERSION}.linux-amd64.tar.gz" | |||
|
|
|||
| curl -sSL "$download_uri" | tar -xz -C / | |||
| curl -sSL --retry 5 --retry-delay 10 --retry-max-time 30 "$download_uri" | tar -xz -C / | |||
There was a problem hiding this comment.
this was a fix for free :)
| @@ -217,10 +217,14 @@ function installClearContainersRuntime() { | |||
| apt-get update && apt-get install --no-install-recommends -y \ | |||
| cc-runtime | |||
|
|
|||
| # Install the systemd service and socket files. | |||
| local repo_uri="https://raw.githubusercontent.com/clearcontainers/proxy/3.0.23" | |||
| curl -sSL --retry 5 --retry-delay 10 --retry-max-time 30 "${repo_uri}/cc-proxy.service.in" | sed 's#@libexecdir@#/usr/libexec#' > /etc/systemd/system/cc-proxy.service | |||
There was a problem hiding this comment.
I recommend doing all the curls as separate commands (curl w/ its own retry doesn't retry every possible, error, such as a corrupt/partly-finished download). We have a retrycmd_get_tarball convenience inside kubernetesprovisionsource.sh that you could use to resiliently get a "valid tarball" (see the code to understand our definition of valid tarball) to disk. Of course for the above because it's not a tarball you'll need another some other way to validate that the downloaded file is "valid".
Thanks for fixing this!
There was a problem hiding this comment.
I updated the tarball one to use retrycmd_get_tarball I think the other is ok, no?
Signed-off-by: Jess Frazelle <[email protected]>
|
jenkins running here: https://jenkins.azure-containers.io/job/k8s-clear-containers/81/console |
Signed-off-by: Jess Frazelle <[email protected]>
Jenkins running here: https://jenkins.azure-containers.io/job/k8s-clear-containers/78/console