Refactor Azure deploy scripts.

Refactored to work with cluster/* scripts which require
actions to be defined as methods in cluster/azure/util.sh
This commit is contained in:
Jeff Mendoza
2014-08-22 15:48:06 -07:00
parent cf6d9b0534
commit d8d09ace41
7 changed files with 286 additions and 175 deletions

View File

@@ -12,13 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
INSTANCE_PREFIX=kubenertes
AZ_LOCATION='West US'
AZ_SSH_KEY=$HOME/.ssh/azure
AZ_SSH_CERT=$HOME/.ssh/azure.pem
AZ_IMAGE=b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-14_04-LTS-amd64-server-20140618.1-en-us-30GB
AZ_SUBNET=Subnet-1
TAG=testing
INSTANCE_PREFIX=kubernetes
if [ -z "$(which azure)" ]; then
echo "Couldn't find azure in PATH"
@@ -33,19 +29,12 @@ if [ -z "$(azure account list | grep true)" ]; then
fi
account=$(azure account list | grep true | awk '{ print $2 }')
if which md5 > /dev/null 2>&1; then
hsh=$(md5 -q -s $account)
AZ_HSH=$(md5 -q -s $account)
else
hsh=$(echo -n "$account" | md5sum)
AZ_HSH=$(echo -n "$account" | md5sum)
fi
hsh=${hsh:0:7}
STG_ACCOUNT=kube$hsh
AZ_VNET=kube-$hsh
AZ_CS=kube-$hsh
AZ_HSH=${AZ_HSH:0:7}
AZ_STG=kube$AZ_HSH
CONTAINER=kube-$TAG
FULL_URL="https://${STG_ACCOUNT}.blob.core.windows.net/$CONTAINER/master-release.tgz"
FULL_URL="https://${AZ_STG}.blob.core.windows.net/$CONTAINER/master-release.tgz"

View File

@@ -29,34 +29,34 @@ source $SCRIPT_DIR/config.sh
$SCRIPT_DIR/../build-release.sh $INSTANCE_PREFIX
if [ -z "$(azure storage account show $STG_ACCOUNT 2>/dev/null | \
if [ -z "$(azure storage account show $AZ_STG 2>/dev/null | \
grep data)" ]; then
azure storage account create -l "$AZ_LOCATION" $STG_ACCOUNT
azure storage account create -l "$AZ_LOCATION" $AZ_STG
fi
stg_key=$(azure storage account keys list $STG_ACCOUNT --json | \
stg_key=$(azure storage account keys list $AZ_STG --json | \
json_val '["primaryKey"]')
if [ -z "$(azure storage container show -a $STG_ACCOUNT -k "$stg_key" \
if [ -z "$(azure storage container show -a $AZ_STG -k "$stg_key" \
$CONTAINER 2>/dev/null | grep data)" ]; then
azure storage container create \
-a $STG_ACCOUNT \
-a $AZ_STG \
-k "$stg_key" \
-p Blob \
$CONTAINER
fi
if [ -n "$(azure storage blob show -a $STG_ACCOUNT -k "$stg_key" \
if [ -n "$(azure storage blob show -a $AZ_STG -k "$stg_key" \
$CONTAINER master-release.tgz 2>/dev/null | grep data)" ]; then
azure storage blob delete \
-a $STG_ACCOUNT \
-a $AZ_STG \
-k "$stg_key" \
$CONTAINER \
master-release.tgz
fi
azure storage blob upload \
-a $STG_ACCOUNT \
-a $AZ_STG \
-k "$stg_key" \
$SCRIPT_DIR/../../output/release/master-release.tgz \
$CONTAINER \