From 95ec94514bcaa7dbaf114199d56b17088601975a Mon Sep 17 00:00:00 2001 From: Jeff Mendoza Date: Fri, 18 Jul 2014 16:13:05 -0700 Subject: [PATCH] Rename and move Azure scripts. --- cluster/{kube-down-azure.sh => azure/kube-down.sh} | 4 ++-- cluster/{kube-up-azure.sh => azure/kube-up.sh} | 12 ++++++------ .../templates/download-release.sh} | 0 .../templates/salt-master.sh} | 0 .../templates/salt-minion.sh} | 0 .../dev-build-and-up.sh} | 6 ++++-- release/{config-azure.sh => azure/config.sh} | 0 release/{release-azure.sh => azure/release.sh} | 8 ++++---- 8 files changed, 16 insertions(+), 14 deletions(-) rename cluster/{kube-down-azure.sh => azure/kube-down.sh} (91%) rename cluster/{kube-up-azure.sh => azure/kube-up.sh} (92%) rename cluster/{templates/download-release-azure.sh => azure/templates/download-release.sh} (100%) rename cluster/{templates/salt-master-azure.sh => azure/templates/salt-master.sh} (100%) rename cluster/{templates/salt-minion-azure.sh => azure/templates/salt-minion.sh} (100%) rename hack/{dev-build-and-up-azure.sh => azure/dev-build-and-up.sh} (85%) rename release/{config-azure.sh => azure/config.sh} (100%) rename release/{release-azure.sh => azure/release.sh} (89%) diff --git a/cluster/kube-down-azure.sh b/cluster/azure/kube-down.sh similarity index 91% rename from cluster/kube-down-azure.sh rename to cluster/azure/kube-down.sh index f4b8a83bd03..804ef6d2190 100755 --- a/cluster/kube-down-azure.sh +++ b/cluster/azure/kube-down.sh @@ -16,8 +16,8 @@ # Tear down a Kubernetes cluster. SCRIPT_DIR=$(CDPATH="" cd $(dirname $0); pwd) -source $SCRIPT_DIR/../release/config-azure.sh -source $SCRIPT_DIR/util.sh +source $SCRIPT_DIR/../../release/azure/config.sh +source $SCRIPT_DIR/../util.sh echo "Bringing down cluster" azure vm delete $MASTER_NAME -b -q diff --git a/cluster/kube-up-azure.sh b/cluster/azure/kube-up.sh similarity index 92% rename from cluster/kube-up-azure.sh rename to cluster/azure/kube-up.sh index a0e978a7899..fe00c19f300 100755 --- a/cluster/kube-up-azure.sh +++ b/cluster/azure/kube-up.sh @@ -21,15 +21,15 @@ set -eu set -o pipefail SCRIPT_DIR=$(CDPATH="" cd $(dirname $0); pwd) -source $SCRIPT_DIR/../release/config-azure.sh -source $SCRIPT_DIR/util.sh +source $SCRIPT_DIR/../../release/azure/config.sh +source $SCRIPT_DIR/../util.sh KUBE_TEMP=$(mktemp -d -t kubernetes.XXXXXX) trap "rm -rf ${KUBE_TEMP}" EXIT get-password echo "Using password: $user:$passwd" -python $SCRIPT_DIR/../third_party/htpasswd/htpasswd.py -b -c \ +python $SCRIPT_DIR/../../third_party/htpasswd/htpasswd.py -b -c \ ${KUBE_TEMP}/htpasswd $user $passwd HTPASSWD=$(cat ${KUBE_TEMP}/htpasswd) @@ -39,8 +39,8 @@ HTPASSWD=$(cat ${KUBE_TEMP}/htpasswd) echo "MASTER_NAME=${MASTER_NAME}" echo "MASTER_RELEASE_TAR=${FULL_URL}" echo "MASTER_HTPASSWD='${HTPASSWD}'" - grep -v "^#" $SCRIPT_DIR/templates/download-release-azure.sh - grep -v "^#" $SCRIPT_DIR/templates/salt-master-azure.sh + grep -v "^#" $SCRIPT_DIR/templates/download-release.sh + grep -v "^#" $SCRIPT_DIR/templates/salt-master.sh ) > ${KUBE_TEMP}/master-start.sh echo "Starting VMs" @@ -81,7 +81,7 @@ for (( i=0; i<${#MINION_NAMES[@]}; i++)); do echo "#!/bin/bash" echo "MASTER_NAME=${MASTER_NAME}" echo "MINION_IP_RANGE=${MINION_IP_RANGES[$i]}" - grep -v "^#" $SCRIPT_DIR/templates/salt-minion-azure.sh + grep -v "^#" $SCRIPT_DIR/templates/salt-minion.sh ) > ${KUBE_TEMP}/minion-start-${i}.sh azure vm create \ diff --git a/cluster/templates/download-release-azure.sh b/cluster/azure/templates/download-release.sh similarity index 100% rename from cluster/templates/download-release-azure.sh rename to cluster/azure/templates/download-release.sh diff --git a/cluster/templates/salt-master-azure.sh b/cluster/azure/templates/salt-master.sh similarity index 100% rename from cluster/templates/salt-master-azure.sh rename to cluster/azure/templates/salt-master.sh diff --git a/cluster/templates/salt-minion-azure.sh b/cluster/azure/templates/salt-minion.sh similarity index 100% rename from cluster/templates/salt-minion-azure.sh rename to cluster/azure/templates/salt-minion.sh diff --git a/hack/dev-build-and-up-azure.sh b/hack/azure/dev-build-and-up.sh similarity index 85% rename from hack/dev-build-and-up-azure.sh rename to hack/azure/dev-build-and-up.sh index 09b40927d86..05211731a24 100755 --- a/hack/dev-build-and-up-azure.sh +++ b/hack/azure/dev-build-and-up.sh @@ -17,8 +17,10 @@ # This script will build a dev release and bring up a new cluster with that # release. +SCRIPT_DIR=$(CDPATH="" cd $(dirname $0); pwd) + # First build a release -$(dirname $0)/../release/release-azure.sh +$SCRIPT_DIR/../../release/azure/release.sh # Now bring a new cluster up with that release. -$(dirname $0)/../cluster/kube-up-azure.sh +$SCRIPT_DIR/../../cluster/azure/kube-up.sh diff --git a/release/config-azure.sh b/release/azure/config.sh similarity index 100% rename from release/config-azure.sh rename to release/azure/config.sh diff --git a/release/release-azure.sh b/release/azure/release.sh similarity index 89% rename from release/release-azure.sh rename to release/azure/release.sh index 722aebe6a34..ccf5ddf0b6c 100755 --- a/release/release-azure.sh +++ b/release/azure/release.sh @@ -25,10 +25,10 @@ function json_val () { python -c 'import json,sys;obj=json.load(sys.stdin);print obj'$1''; } -source $SCRIPT_DIR/config-azure.sh -source $SCRIPT_DIR/../cluster/${KUBE_CONFIG_FILE-"config-default.sh"} +source $SCRIPT_DIR/config.sh +source $SCRIPT_DIR/../../cluster/${KUBE_CONFIG_FILE-"config-default.sh"} -$SCRIPT_DIR/build-release.sh $INSTANCE_PREFIX +$SCRIPT_DIR/../build-release.sh $INSTANCE_PREFIX if [ -z "$(azure storage account show $STG_ACCOUNT 2>/dev/null | \ grep data)" ]; then @@ -59,6 +59,6 @@ fi azure storage blob upload \ -a $STG_ACCOUNT \ -k "$stg_key" \ - $SCRIPT_DIR/../output/release/master-release.tgz \ + $SCRIPT_DIR/../../output/release/master-release.tgz \ $CONTAINER \ master-release.tgz