github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10686 from mesosphere/kube-util 

Move sourcing of provider-specific util.sh into kube-util.sh
pull/6/head
Mike Danese 2015-07-24 10:31:48 -07:00
parent ae1c8e55ef 0229cb01fc
commit bfd22a6974
7 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/upgrade.sh
View File

@ -29,7 +29,7 @@ fi
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
source "${KUBE_ROOT}/cluster/kube-env.sh" source "${KUBE_ROOT}/cluster/kube-env.sh"
source "${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh" source "${KUBE_ROOT}/cluster/kube-util.sh"
function usage() { function usage() {
echo "!!! EXPERIMENTAL !!!" echo "!!! EXPERIMENTAL !!!"

2
cluster/kube-down.sh
View File

@ -22,7 +22,7 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/cluster/kube-env.sh" source "${KUBE_ROOT}/cluster/kube-env.sh"
source "${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh" source "${KUBE_ROOT}/cluster/kube-util.sh"
echo "Bringing down cluster using provider: $KUBERNETES_PROVIDER" echo "Bringing down cluster using provider: $KUBERNETES_PROVIDER"

2
cluster/kube-push.sh
View File

@ -25,7 +25,7 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/cluster/kube-env.sh" source "${KUBE_ROOT}/cluster/kube-env.sh"
source "${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh" source "${KUBE_ROOT}/cluster/kube-util.sh"
function usage() { function usage() {
echo "${0} [-m|-n <node id>] <version>" echo "${0} [-m|-n <node id>] <version>"

2
cluster/kube-up.sh
View File

@ -26,7 +26,7 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/cluster/kube-env.sh" source "${KUBE_ROOT}/cluster/kube-env.sh"
source "${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh" source "${KUBE_ROOT}/cluster/kube-util.sh"
echo "... Starting cluster using provider: $KUBERNETES_PROVIDER" >&2 echo "... Starting cluster using provider: $KUBERNETES_PROVIDER" >&2

40
cluster/kube-util.sh
View File

@ -16,73 +16,83 @@
# A library of helper functions that each provider hosting Kubernetes must implement to use cluster/kube-*.sh scripts. # A library of helper functions that each provider hosting Kubernetes must implement to use cluster/kube-*.sh scripts.
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
# Must ensure that the following ENV vars are set # Must ensure that the following ENV vars are set
function detect-master { function detect-master {
echo "KUBE_MASTER_IP: $KUBE_MASTER_IP" echo "KUBE_MASTER_IP: $KUBE_MASTER_IP" 1>&2
echo "KUBE_MASTER: $KUBE_MASTER" echo "KUBE_MASTER: $KUBE_MASTER" 1>&2
} }
# Get minion names if they are not static. # Get minion names if they are not static.
function detect-minion-names { function detect-minion-names {
echo "MINION_NAMES: ${MINION_NAMES[*]}" echo "MINION_NAMES: [${MINION_NAMES[*]}]" 1>&2
} }
# Get minion IP addresses and store in KUBE_MINION_IP_ADDRESSES[] # Get minion IP addresses and store in KUBE_MINION_IP_ADDRESSES[]
function detect-minions { function detect-minions {
echo "KUBE_MINION_IP_ADDRESSES=[]" echo "KUBE_MINION_IP_ADDRESSES: [${KUBE_MINION_IP_ADDRESSES[*]}]" 1>&2
} }
# Verify prereqs on host machine # Verify prereqs on host machine
function verify-prereqs { function verify-prereqs {
echo "TODO" echo "TODO: verify-prereqs" 1>&2
} }
# Instantiate a kubernetes cluster # Instantiate a kubernetes cluster
function kube-up { function kube-up {
echo "TODO" echo "TODO: kube-up" 1>&2
} }
# Delete a kubernetes cluster # Delete a kubernetes cluster
function kube-down { function kube-down {
echo "TODO" echo "TODO: kube-down" 1>&2
} }
# Update a kubernetes cluster # Update a kubernetes cluster
function kube-push { function kube-push {
echo "TODO" echo "TODO: kube-push" 1>&2
} }
# Prepare update a kubernetes component # Prepare update a kubernetes component
function prepare-push { function prepare-push {
echo "TODO" echo "TODO: prepare-push" 1>&2
} }
# Update a kubernetes master # Update a kubernetes master
function push-master { function push-master {
echo "TODO" echo "TODO: push-master" 1>&2
} }
# Update a kubernetes node # Update a kubernetes node
function push-node { function push-node {
echo "TODO" echo "TODO: push-node" 1>&2
} }
# Execute prior to running tests to build a release if required for env # Execute prior to running tests to build a release if required for env
function test-build-release { function test-build-release {
echo "TODO" echo "TODO: test-build-release" 1>&2
} }
# Execute prior to running tests to initialize required structure # Execute prior to running tests to initialize required structure
function test-setup { function test-setup {
echo "TODO" echo "TODO: test-setup" 1>&2
} }
# Execute after running tests to perform any required clean-up # Execute after running tests to perform any required clean-up
function test-teardown { function test-teardown {
echo "TODO" echo "TODO: test-teardown" 1>&2
} }
# Set the {KUBE_USER} and {KUBE_PASSWORD} environment values required to interact with provider # Set the {KUBE_USER} and {KUBE_PASSWORD} environment values required to interact with provider
function get-password { function get-password {
echo "TODO" echo "TODO: get-password" 1>&2
} }
# Providers util.sh scripts should define functions that override the above default functions impls
if [ -n "${KUBERNETES_PROVIDER}" ]; then
PROVIDER_UTILS="${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh"
if [ -f ${PROVIDER_UTILS} ]; then
source "${PROVIDER_UTILS}"
fi
fi

5
cluster/kubectl.sh
View File

@ -32,10 +32,7 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/cluster/kube-env.sh" source "${KUBE_ROOT}/cluster/kube-env.sh"
UTILS=${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh source "${KUBE_ROOT}/cluster/kube-util.sh"
if [ -f ${UTILS} ]; then
source "${UTILS}"
fi
# Get the absolute path of the directory component of a file, i.e. the # Get the absolute path of the directory component of a file, i.e. the
# absolute path of the dirname of $1. # absolute path of the dirname of $1.

2
cluster/validate-cluster.sh
View File

@ -22,7 +22,7 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/cluster/kube-env.sh" source "${KUBE_ROOT}/cluster/kube-env.sh"
source "${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh" source "${KUBE_ROOT}/cluster/kube-util.sh"
MINIONS_FILE=/tmp/minions-$$ MINIONS_FILE=/tmp/minions-$$
trap 'rm -rf "${MINIONS_FILE}"' EXIT trap 'rm -rf "${MINIONS_FILE}"' EXIT