Comment and whitespace fixes.

This commit is contained in:
Jeff Mendoza
2014-07-18 12:28:18 -07:00
parent 3ff6b0f8a6
commit b4183409ab
4 changed files with 84 additions and 46 deletions

View File

@@ -1,3 +1,16 @@
# Copyright 2014 Google Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
AZ_LOCATION='West US'
AZ_SSH_KEY=$HOME/.ssh/azure
@@ -8,11 +21,13 @@ TAG=testing
if [ -z "$(which azure)" ]; then
echo "Couldn't find azure in PATH"
echo " please install with 'npm install azure-cli'"
exit 1
fi
if [ -z "$(azure account list | grep true)" ]; then
echo "Default azure account not set"
echo " please set with 'azure account set'"
exit 1
fi

View File

@@ -1,12 +1,28 @@
#!/bin/bash
# Copyright 2014 Google Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# This script will build and release Kubernetes.
set -eu
set -o pipefail
IFS=$'\n\t'
SCRIPT_DIR=$(CDPATH="" cd $(dirname $0); pwd)
function json_val () {
python -c 'import json,sys;obj=json.load(sys.stdin);print obj'$1'';
function json_val () {
python -c 'import json,sys;obj=json.load(sys.stdin);print obj'$1'';
}
source $SCRIPT_DIR/config-azure.sh
@@ -14,30 +30,30 @@ source $SCRIPT_DIR/../cluster/${KUBE_CONFIG_FILE-"config-default.sh"}
$SCRIPT_DIR/build-release.sh $INSTANCE_PREFIX
if [ -z "$(azure storage account show $STG_ACCOUNT 2>/dev/null | grep data)" ]; then
if [ -z "$(azure storage account show $STG_ACCOUNT 2>/dev/null | \
grep data)" ]; then
azure storage account create -l "$AZ_LOCATION" $STG_ACCOUNT
fi
stg_key=$(azure storage account keys list $STG_ACCOUNT --json | json_val '["primaryKey"]')
stg_key=$(azure storage account keys list $STG_ACCOUNT --json | \
json_val '["primaryKey"]')
if [ -z "$(azure storage container show -a $STG_ACCOUNT -k "$stg_key" $CONTAINER 2>/dev/null | grep data)" ]; then
if [ -z "$(azure storage container show -a $STG_ACCOUNT -k "$stg_key" \
$CONTAINER 2>/dev/null | grep data)" ]; then
azure storage container create \
-a $STG_ACCOUNT \
-k "$stg_key" \
-p Blob \
$CONTAINER
-a $STG_ACCOUNT \
-k "$stg_key" \
-p Blob \
$CONTAINER
fi
if [ -n "$(azure storage blob show \
-a $STG_ACCOUNT \
-k "$stg_key" \
$CONTAINER \
master-release.tgz 2>/dev/null | grep data)" ]; then
if [ -n "$(azure storage blob show -a $STG_ACCOUNT -k "$stg_key" \
$CONTAINER master-release.tgz 2>/dev/null | grep data)" ]; then
azure storage blob delete \
-a $STG_ACCOUNT \
-k "$stg_key" \
$CONTAINER \
master-release.tgz
-a $STG_ACCOUNT \
-k "$stg_key" \
$CONTAINER \
master-release.tgz
fi
azure storage blob upload \