From 22cbd89a6da106e5307a2ace09690fa299efb2a7 Mon Sep 17 00:00:00 2001
From: "Egorov, Stanislav (se6518)" <se6518@att.com>
Date: Mon, 24 Jun 2019 10:51:20 -0700
Subject: [PATCH] Extract hyperkube before promenade

Prepare hyperkube binary before running promenade container.
This is to simplify procedure when using hyperkube image.

Change-Id: I04dfdef1247e7d1701e673e53132e6a9208d3c64
---
 .../multi_nodes_gate/airship_gate/lib/config.sh |  3 ++-
 .../airship_gate/stages/build-scripts.sh        | 17 ++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/multi_nodes_gate/airship_gate/lib/config.sh b/tools/multi_nodes_gate/airship_gate/lib/config.sh
index 7cea49c1..6b7a41a9 100644
--- a/tools/multi_nodes_gate/airship_gate/lib/config.sh
+++ b/tools/multi_nodes_gate/airship_gate/lib/config.sh
@@ -14,8 +14,9 @@ export IMAGE_COREDNS=${IMAGE_COREDNS:-docker.io/coredns/coredns:1.2.2}
 export IMAGE_QUAGGA=${IMAGE_QUAGGA:-docker.io/cumulusnetworks/quagga:CL3.3.2}
 export IMAGE_DRYDOCK_CLI=${IMAGE_DRYDOCK_CLI:-quay.io/airshipit/drydock:d93d6d5a0a370ced536180612d1ade708e29cd47}
 export IMAGE_DOCKER_REGISTRY=${IMAGE_DOCKER_REGISTRY:-"docker.io/registry:2"}
+export IMAGE_HYPERKUBE=${IMAGE_HYPERKUBE:-gcr.io/google_containers/hyperkube-amd64:v1.10.2}
 export PROMENADE_DEBUG=${PROMENADE_DEBUG:-0}
-export PROMENADE_TMP_LOCAL=${PROMENADE_TMP_LOCAL:-tmp_bin}
+export PROMENADE_TMP_LOCAL=${PROMENADE_TMP_LOCAL:-cache}
 export REGISTRY_DATA_DIR=${REGISTRY_DATA_DIR:-/mnt/registry}
 export VIRSH_POOL=${VIRSH_POOL:-airship}
 export VIRSH_POOL_PATH=${VIRSH_POOL_PATH:-/var/lib/libvirt/airship}
diff --git a/tools/multi_nodes_gate/airship_gate/stages/build-scripts.sh b/tools/multi_nodes_gate/airship_gate/stages/build-scripts.sh
index 4e237700..c718749f 100755
--- a/tools/multi_nodes_gate/airship_gate/stages/build-scripts.sh
+++ b/tools/multi_nodes_gate/airship_gate/stages/build-scripts.sh
@@ -30,8 +30,13 @@ PROMENADE_TMP="${TEMP_DIR}/${PROMENADE_TMP_LOCAL}"
 mkdir -p $PROMENADE_TMP
 chmod 777 $PROMENADE_TMP
 
-DOCKER_SOCK="/var/run/docker.sock"
-sudo chmod o+rw $DOCKER_SOCK
+log Prepare hyperkube
+docker run --rm -t \
+    --network host \
+    -v "${PROMENADE_TMP}:/tmp/${PROMENADE_TMP_LOCAL}" \
+    ${DOCKER_RUN_OPTS[*]} \
+    "${IMAGE_HYPERKUBE}" \
+        cp /hyperkube /tmp/${PROMENADE_TMP_LOCAL}
 
 log Building scripts
 docker run --rm -t \
@@ -41,11 +46,7 @@ docker run --rm -t \
     -v "${GATE_DEPOT}:/gate" \
     -v "${CERT_DEPOT}:/certs" \
     -v "${SCRIPT_DEPOT}:/scripts" \
-    -v "${PROMENADE_TMP}:/${PROMENADE_TMP_LOCAL}" \
-    -v "${DOCKER_SOCK}:${DOCKER_SOCK}" \
-    -e "DOCKER_HOST=unix:/${DOCKER_SOCK}" \
-    -e "PROMENADE_TMP=${PROMENADE_TMP}" \
-    -e "PROMENADE_TMP_LOCAL=/${PROMENADE_TMP_LOCAL}" \
+    -v "${PROMENADE_TMP}:/tmp/${PROMENADE_TMP_LOCAL}" \
     -e "PROMENADE_ENCRYPTION_KEY=${PROMENADE_ENCRYPTION_KEY}" \
     ${DOCKER_RUN_OPTS[*]} \
     "${IMAGE_PROMENADE_CLI}" \
@@ -54,5 +55,3 @@ docker run --rm -t \
                 --validators \
                 -o /scripts \
                 /config/*.yaml ${CERTS_PATH} ${KEYS_PATH}
-
-sudo chmod o-rw $DOCKER_SOCK