From aff803bed99d7826fe38a69f3c80e0b846bfebb0 Mon Sep 17 00:00:00 2001 From: Yifan Gu Date: Tue, 23 Feb 2016 18:18:13 -0800 Subject: [PATCH] gce/coreos: Refactor the downloading command to handle errors better. --- cluster/gce/coreos/master.yaml | 15 ++++++++++----- cluster/gce/coreos/node.yaml | 12 ++++++++---- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/cluster/gce/coreos/master.yaml b/cluster/gce/coreos/master.yaml index d1a4bd895d..a44f4bb598 100644 --- a/cluster/gce/coreos/master.yaml +++ b/cluster/gce/coreos/master.yaml @@ -28,13 +28,16 @@ coreos: Documentation=http://github.com/coreos/rkt Requires=network-online.target After=network-online.target + Requires=kube-env.service + After=kube-env.service [Service] Type=oneshot RemainAfterExit=yes EnvironmentFile=/etc/kube-env ExecStartPre=/usr/bin/mkdir -p /etc/rkt ExecStartPre=/usr/bin/mkdir -p /opt/downloads - ExecStartPre=/usr/bin/curl --location --create-dirs --output /opt/downloads/rkt.tar.gz https://github.com/coreos/rkt/releases/download/v${RKT_VERSION}/rkt-v${RKT_VERSION}.tar.gz + ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output \ + /opt/downloads/rkt.tar.gz https://github.com/coreos/rkt/releases/download/v${RKT_VERSION}/rkt-v${RKT_VERSION}.tar.gz ExecStart=/usr/bin/tar xf /opt/downloads/rkt.tar.gz -C /opt --overwrite - name: kubernetes-download-salt.service @@ -51,7 +54,8 @@ coreos: RemainAfterExit=yes EnvironmentFile=/etc/kube-env ExecStartPre=/usr/bin/mkdir -p /opt/downloads - ExecStartPre=/usr/bin/curl --location --create-dirs --output /opt/downloads/kubernetes-salt.tar.gz ${SALT_TAR_URL} + ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output \ + /opt/downloads/kubernetes-salt.tar.gz ${SALT_TAR_URL} # TODO(yifan): Check hash. ExecStart=/usr/bin/tar xf /opt/downloads/kubernetes-salt.tar.gz -C /opt --overwrite @@ -69,7 +73,8 @@ coreos: RemainAfterExit=yes EnvironmentFile=/etc/kube-env ExecStartPre=/usr/bin/mkdir -p /opt/downloads - ExecStartPre=/usr/bin/curl --location --create-dirs --output /opt/downloads/kubernetes-manifests.tar.gz ${KUBE_MANIFESTS_TAR_URL} + ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output \ + /opt/downloads/kubernetes-manifests.tar.gz ${KUBE_MANIFESTS_TAR_URL} # TODO(yifan): Check hash. ExecStartPre=/usr/bin/mkdir -p /opt/kube-manifests ExecStart=/usr/bin/tar xf /opt/downloads/kubernetes-manifests.tar.gz -C /opt/kube-manifests --overwrite @@ -88,7 +93,8 @@ coreos: RemainAfterExit=yes EnvironmentFile=/etc/kube-env ExecStartPre=/usr/bin/mkdir -p /opt/downloads - ExecStartPre=/usr/bin/curl --location --create-dirs --output /opt/downloads/kubernetes-server-linux-amd64.tar.gz ${SERVER_BINARY_TAR_URL} + ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output \ + /opt/downloads/kubernetes-server-linux-amd64.tar.gz ${SERVER_BINARY_TAR_URL} # TODO(yifan): Check hash. ExecStart=/usr/bin/tar xf /opt/downloads/kubernetes-server-linux-amd64.tar.gz -C /opt --overwrite @@ -131,7 +137,6 @@ coreos: RestartSec=10 - name: docker.service - command: start drop-ins: - name: 50-docker-opts.conf content: | diff --git a/cluster/gce/coreos/node.yaml b/cluster/gce/coreos/node.yaml index d2faa576ec..882f1eb7d9 100644 --- a/cluster/gce/coreos/node.yaml +++ b/cluster/gce/coreos/node.yaml @@ -28,13 +28,16 @@ coreos: Documentation=http://github.com/coreos/rkt Requires=network-online.target After=network-online.target + Requires=kube-env.service + After=kube-env.service [Service] Type=oneshot RemainAfterExit=yes EnvironmentFile=/etc/kube-env ExecStartPre=/usr/bin/mkdir -p /etc/rkt ExecStartPre=/usr/bin/mkdir -p /opt/downloads - ExecStartPre=/usr/bin/curl --location --create-dirs --output /opt/downloads/rkt.tar.gz https://github.com/coreos/rkt/releases/download/v${RKT_VERSION}/rkt-v${RKT_VERSION}.tar.gz + ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output \ + /opt/downloads/rkt.tar.gz https://github.com/coreos/rkt/releases/download/v${RKT_VERSION}/rkt-v${RKT_VERSION}.tar.gz ExecStart=/usr/bin/tar xf /opt/downloads/rkt.tar.gz -C /opt --overwrite - name: kubernetes-download-manifests.service @@ -51,7 +54,8 @@ coreos: RemainAfterExit=yes EnvironmentFile=/etc/kube-env ExecStartPre=/usr/bin/mkdir -p /opt/downloads - ExecStartPre=/usr/bin/curl --location --create-dirs --output /opt/downloads/kubernetes-manifests.tar.gz ${KUBE_MANIFESTS_TAR_URL} + ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output \ + /opt/downloads/kubernetes-manifests.tar.gz ${KUBE_MANIFESTS_TAR_URL} # TODO(yifan): Check hash. ExecStartPre=/usr/bin/mkdir -p /opt/kube-manifests ExecStart=/usr/bin/tar xf /opt/downloads/kubernetes-manifests.tar.gz -C /opt/kube-manifests --overwrite @@ -70,7 +74,8 @@ coreos: RemainAfterExit=yes EnvironmentFile=/etc/kube-env ExecStartPre=/usr/bin/mkdir -p /opt/kubernetes/pkg - ExecStartPre=/usr/bin/curl --location --create-dirs --output /opt/kubernetes/pkg/kubernetes-server-linux-amd64.tar.gz ${SERVER_BINARY_TAR_URL} + ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output \ + /opt/kubernetes/pkg/kubernetes-server-linux-amd64.tar.gz ${SERVER_BINARY_TAR_URL} ExecStart=/usr/bin/tar xf /opt/kubernetes/pkg/kubernetes-server-linux-amd64.tar.gz -C /opt --overwrite - name: kubelet.service @@ -126,7 +131,6 @@ coreos: RestartSec=10 - name: docker.service - command: start drop-ins: - name: 50-docker-opts.conf content: |