Remove Azure from icebox.

f8df2d34 · Jeff Mendoza · 9934a0ac · 9934a0ac · 9934a0ac · 9934a0ac
Commit f8df2d34 authored Nov 18, 2014 by Jeff Mendoza
7 changed files
--- a/icebox/cluster/azure/config-default.sh
+++ b/icebox/cluster/azure/config-default.sh
-#!/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.
-
-SCRIPT_DIR=$(CDPATH="" cd $(dirname $0); pwd)
-source $SCRIPT_DIR/../release/azure/config.sh
-
-AZ_SSH_KEY=$HOME/.ssh/azure_rsa
-AZ_SSH_CERT=$HOME/.ssh/azure.pem
-AZ_IMAGE=b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-14_04_1-LTS-amd64-server-20140926-en-us-30GB
-AZ_SUBNET=Subnet-1
-AZ_VNET=kube-$AZ_HSH
-AZ_CS=kube-$AZ_HSH
-
-NUM_MINIONS=4
-
-MASTER_NAME="${INSTANCE_PREFIX}-master"
-MASTER_TAG="${INSTANCE_PREFIX}-master"
-MINION_TAG="${INSTANCE_PREFIX}-minion"
-MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${NUM_MINIONS}}))
-MINION_IP_RANGES=($(eval echo "10.244.{1..${NUM_MINIONS}}.0/24"))
-MINION_SCOPES=""
--- a/icebox/cluster/azure/templates/download-release.sh
+++ b/icebox/cluster/azure/templates/download-release.sh
-#!/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.
-
-# Download and install release
-
-# This script assumes that the environment variable MASTER_RELEASE_TAR contains
-# the release tar to download and unpack.  It is meant to be pushed to the
-# master and run.
-
-echo "Downloading release ($MASTER_RELEASE_TAR)"
-wget $MASTER_RELEASE_TAR
-
-echo "Unpacking release"
-rm -rf master-release || false
-tar xzf master-release.tgz
-
-echo "Running release install script"
-sudo master-release/src/scripts/master-release-install.sh
--- a/icebox/cluster/azure/templates/salt-master.sh
+++ b/icebox/cluster/azure/templates/salt-master.sh
-#!/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.
-
-# Prepopulate the name of the Master
-mkdir -p /etc/salt/minion.d
-echo "master: $MASTER_NAME" > /etc/salt/minion.d/master.conf
-
-cat <<EOF >/etc/salt/minion.d/grains.conf
-grains:
-  roles:
-    - kubernetes-master
-  cloud: azure
-EOF
-
-# Auto accept all keys from minions that try to join
-mkdir -p /etc/salt/master.d
-cat <<EOF >/etc/salt/master.d/auto-accept.conf
-auto_accept: True
-EOF
-
-cat <<EOF >/etc/salt/master.d/reactor.conf
-# React to new minions starting by running highstate on them.
-reactor:
-  - 'salt/minion/*/start':
-    - /srv/reactor/start.sls
-EOF
-
-mkdir -p /srv/salt/nginx
-echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd
-
-mkdir -p /etc/openvpn
-umask=$(umask)
-umask 0066
-echo "$CA_CRT" > /etc/openvpn/ca.crt
-echo "$SERVER_CRT" > /etc/openvpn/server.crt
-echo "$SERVER_KEY" > /etc/openvpn/server.key
-umask $umask
-
-# Install Salt
-#
-# We specify -X to avoid a race condition that can cause minion failure to
-# install.  See https://github.com/saltstack/salt-bootstrap/issues/270
-#
-# -M installs the master
-curl -L http://bootstrap.saltstack.com | sh -s -- -M -X
-
-echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd
--- a/icebox/cluster/azure/templates/salt-minion.sh
+++ b/icebox/cluster/azure/templates/salt-minion.sh
-#!/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.
-
-mkdir -p /etc/openvpn
-umask=$(umask)
-umask 0066
-echo "$CA_CRT" > /etc/openvpn/ca.crt
-echo "$CLIENT_CRT" > /etc/openvpn/client.crt
-echo "$CLIENT_KEY" > /etc/openvpn/client.key
-umask $umask
-
-# Prepopulate the name of the Master
-mkdir -p /etc/salt/minion.d
-echo "master: $MASTER_NAME" > /etc/salt/minion.d/master.conf
-
-# Turn on debugging for salt-minion
-# echo "DAEMON_ARGS=\"\$DAEMON_ARGS --log-file-level=debug\"" > /etc/default/salt-minion
-
-hostnamef=$(hostname -f)
-sudo apt-get install ipcalc
-netmask=$(ipcalc $MINION_IP_RANGE | grep Netmask | awk '{ print $2 }')
-network=$(ipcalc $MINION_IP_RANGE | grep Address | awk '{ print $2 }')
-cbrstring="$network $netmask"
-
-# Our minions will have a pool role to distinguish them from the master.
-cat <<EOF >/etc/salt/minion.d/grains.conf
-grains:
-  roles:
-    - kubernetes-pool
-  cbr-cidr: $MINION_IP_RANGE
-  cloud: azure
-  hostnamef: $hostnamef
-  cbr-string: $cbrstring
-EOF
-
-# Install Salt
-#
-# We specify -X to avoid a race condition that can cause minion failure to
-# install.  See https://github.com/saltstack/salt-bootstrap/issues/270
-curl -L http://bootstrap.saltstack.com | sh -s -- -X
--- a/icebox/cluster/azure/util.sh
+++ b/icebox/cluster/azure/util.sh
--- a/icebox/release/azure/config.sh
+++ b/icebox/release/azure/config.sh
-# 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.
-
-INSTANCE_PREFIX=kubenertes
-AZ_LOCATION='West US'
-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
-
-account=$(azure account list | grep true | awk '{ print $2 }')
-if which md5 > /dev/null 2>&1; then
-  AZ_HSH=$(md5 -q -s $account)
-else
-  AZ_HSH=$(echo -n "$account" | md5sum)
-fi
-AZ_HSH=${AZ_HSH:0:7}
-AZ_STG=kube$AZ_HSH
-CONTAINER=kube-$TAG
-FULL_URL="https://${AZ_STG}.blob.core.windows.net/$CONTAINER/master-release.tgz"
--- a/icebox/release/azure/release.sh
+++ b/icebox/release/azure/release.sh
-#!/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'';
-}
-
-source $SCRIPT_DIR/config.sh
-
-$SCRIPT_DIR/../build-release.sh $INSTANCE_PREFIX
-
-if [ -z "$(azure storage account show $AZ_STG 2>/dev/null | \
-    grep data)" ]; then
-    azure storage account create -l "$AZ_LOCATION" $AZ_STG
-fi
-
-stg_key=$(azure storage account keys list $AZ_STG --json | \
-    json_val '["primaryKey"]')
-
-if [ -z "$(azure storage container show -a $AZ_STG -k "$stg_key" \
-    $CONTAINER 2>/dev/null | grep data)" ]; then
-    azure storage container create \
-        -a $AZ_STG \
-        -k "$stg_key" \
-        -p Blob \
-        $CONTAINER
-fi
-
-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 $AZ_STG \
-        -k "$stg_key" \
-        $CONTAINER \
-        master-release.tgz
-fi
-
-azure storage blob upload \
-    -a $AZ_STG \
-    -k "$stg_key" \
-    $SCRIPT_DIR/../../_output/release/master-release.tgz \
-    $CONTAINER \
-    master-release.tgz