From 1b777147614e5efdd8ec45d2cc33341360e94111 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Tue, 15 Oct 2019 22:00:40 -0400 Subject: [PATCH 1/2] redirect gsutil install output to dev/null --- examples/controlplane/kustomizeversions.yaml | 6 +++--- examples/machinedeployment/kustomizeversions.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/controlplane/kustomizeversions.yaml b/examples/controlplane/kustomizeversions.yaml index 99e2ef1d5..7236f8828 100644 --- a/examples/controlplane/kustomizeversions.yaml +++ b/examples/controlplane/kustomizeversions.yaml @@ -21,7 +21,7 @@ spec: [[ $(id -u) != 0 ]] && SUDO="sudo" || SUDO="" if ! gsutil version > /dev/null; then - curl -sSL https://sdk.cloud.google.com > /tmp/gcl && bash /tmp/gcl --install-dir=~/gcloud --disable-prompts + curl -sSL https://sdk.cloud.google.com > /tmp/gcl && bash /tmp/gcl --install-dir=~/gcloud --disable-prompts > /dev/null 2>&1 export PATH=$PATH:~/gcloud/google-cloud-sdk/bin fi gsutil version @@ -96,7 +96,7 @@ spec: [[ $(id -u) != 0 ]] && SUDO="sudo" || SUDO="" if ! gsutil version > /dev/null; then - curl -sSL https://sdk.cloud.google.com > /tmp/gcl && bash /tmp/gcl --install-dir=~/gcloud --disable-prompts + curl -sSL https://sdk.cloud.google.com > /tmp/gcl && bash /tmp/gcl --install-dir=~/gcloud --disable-prompts > /dev/null 2>&1 export PATH=$PATH:~/gcloud/google-cloud-sdk/bin fi gsutil version @@ -171,7 +171,7 @@ spec: [[ $(id -u) != 0 ]] && SUDO="sudo" || SUDO="" if ! gsutil version > /dev/null; then - curl -sSL https://sdk.cloud.google.com > /tmp/gcl && bash /tmp/gcl --install-dir=~/gcloud --disable-prompts + curl -sSL https://sdk.cloud.google.com > /tmp/gcl && bash /tmp/gcl --install-dir=~/gcloud --disable-prompts > /dev/null 2>&1 export PATH=$PATH:~/gcloud/google-cloud-sdk/bin fi gsutil version diff --git a/examples/machinedeployment/kustomizeversions.yaml b/examples/machinedeployment/kustomizeversions.yaml index 4df0fec32..db5a26af5 100644 --- a/examples/machinedeployment/kustomizeversions.yaml +++ b/examples/machinedeployment/kustomizeversions.yaml @@ -21,7 +21,7 @@ spec: [[ $(id -u) != 0 ]] && SUDO="sudo" || SUDO="" if ! gsutil version > /dev/null; then - curl -sSL https://sdk.cloud.google.com > /tmp/gcl && bash /tmp/gcl --install-dir=~/gcloud --disable-prompts + curl -sSL https://sdk.cloud.google.com > /tmp/gcl && bash /tmp/gcl --install-dir=~/gcloud --disable-prompts > /dev/null 2>&1 export PATH=$PATH:~/gcloud/google-cloud-sdk/bin fi gsutil version From 6a100858db9e744e7879d96a90d22b3f3155e96a Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Tue, 15 Oct 2019 22:01:43 -0400 Subject: [PATCH 2/2] image builder already uses 1.3.0 containerd --- examples/controlplane/kustomizeversions.yaml | 15 --------------- examples/machinedeployment/kustomizeversions.yaml | 5 ----- 2 files changed, 20 deletions(-) diff --git a/examples/controlplane/kustomizeversions.yaml b/examples/controlplane/kustomizeversions.yaml index 7236f8828..652bafc50 100644 --- a/examples/controlplane/kustomizeversions.yaml +++ b/examples/controlplane/kustomizeversions.yaml @@ -52,11 +52,6 @@ spec: ${SUDO} dpkg -i "$CI_DIR/$CI_PACKAGE.$PACKAGE_EXT" || echo "* ignoring expected 'dpkg -i' result" done - CONTAINERD_VERSION="${CONTAINERD_VERSION:-1.3.0}" - wget --tries 10 https://storage.googleapis.com/cri-containerd-release/cri-containerd-${CONTAINERD_VERSION}.linux-amd64.tar.gz - tar --no-overwrite-dir -C $CI_DIR -xzf cri-containerd-${CONTAINERD_VERSION}.linux-amd64.tar.gz - export PATH=$CI_DIR/usr/local/bin:$PATH - for CI_CONTAINER in "${CONTAINERS_TO_TEST[@]}"; do echo "* downloading package: $CI_URL/$CI_CONTAINER.$CONTAINER_EXT" gsutil cp "$CI_URL/$CI_CONTAINER.$CONTAINER_EXT" "$CI_DIR/$CI_CONTAINER.$CONTAINER_EXT" @@ -127,11 +122,6 @@ spec: ${SUDO} dpkg -i "$CI_DIR/$CI_PACKAGE.$PACKAGE_EXT" || echo "* ignoring expected 'dpkg -i' result" done - CONTAINERD_VERSION="${CONTAINERD_VERSION:-1.3.0}" - wget --tries 10 https://storage.googleapis.com/cri-containerd-release/cri-containerd-${CONTAINERD_VERSION}.linux-amd64.tar.gz - tar --no-overwrite-dir -C $CI_DIR -xzf cri-containerd-${CONTAINERD_VERSION}.linux-amd64.tar.gz - export PATH=$CI_DIR/usr/local/bin:$PATH - for CI_CONTAINER in "${CONTAINERS_TO_TEST[@]}"; do echo "* downloading package: $CI_URL/$CI_CONTAINER.$CONTAINER_EXT" gsutil cp "$CI_URL/$CI_CONTAINER.$CONTAINER_EXT" "$CI_DIR/$CI_CONTAINER.$CONTAINER_EXT" @@ -202,11 +192,6 @@ spec: ${SUDO} dpkg -i "$CI_DIR/$CI_PACKAGE.$PACKAGE_EXT" || echo "* ignoring expected 'dpkg -i' result" done - CONTAINERD_VERSION="${CONTAINERD_VERSION:-1.3.0}" - wget --tries 10 https://storage.googleapis.com/cri-containerd-release/cri-containerd-${CONTAINERD_VERSION}.linux-amd64.tar.gz - tar --no-overwrite-dir -C $CI_DIR -xzf cri-containerd-${CONTAINERD_VERSION}.linux-amd64.tar.gz - export PATH=$CI_DIR/usr/local/bin:$PATH - for CI_CONTAINER in "${CONTAINERS_TO_TEST[@]}"; do echo "* downloading package: $CI_URL/$CI_CONTAINER.$CONTAINER_EXT" gsutil cp "$CI_URL/$CI_CONTAINER.$CONTAINER_EXT" "$CI_DIR/$CI_CONTAINER.$CONTAINER_EXT" diff --git a/examples/machinedeployment/kustomizeversions.yaml b/examples/machinedeployment/kustomizeversions.yaml index db5a26af5..dc1001285 100644 --- a/examples/machinedeployment/kustomizeversions.yaml +++ b/examples/machinedeployment/kustomizeversions.yaml @@ -52,11 +52,6 @@ spec: ${SUDO} dpkg -i "$CI_DIR/$CI_PACKAGE.$PACKAGE_EXT" || echo "* ignoring expected 'dpkg -i' result" done - CONTAINERD_VERSION="${CONTAINERD_VERSION:-1.3.0}" - wget --tries 10 https://storage.googleapis.com/cri-containerd-release/cri-containerd-${CONTAINERD_VERSION}.linux-amd64.tar.gz - tar --no-overwrite-dir -C $CI_DIR -xzf cri-containerd-${CONTAINERD_VERSION}.linux-amd64.tar.gz - export PATH=$CI_DIR/usr/local/bin:$PATH - for CI_CONTAINER in "${CONTAINERS_TO_TEST[@]}"; do echo "* downloading package: $CI_URL/$CI_CONTAINER.$CONTAINER_EXT" gsutil cp "$CI_URL/$CI_CONTAINER.$CONTAINER_EXT" "$CI_DIR/$CI_CONTAINER.$CONTAINER_EXT"