github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Fixing identification script and adding output to ignore.

Browse Source
This commit is contained in:
Matt Bruzek 2016-08-04 14:05:28 -05:00
parent b9ac078be7
commit 1d3b52fd9f
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -88,6 +88,7 @@ network_closure.sh
# Juju Stuff # Juju Stuff
/cluster/juju/charms/* /cluster/juju/charms/*
/cluster/juju/bundles/local.yaml
# Downloaded Kubernetes binary release # Downloaded Kubernetes binary release
/kubernetes/ /kubernetes/

14
cluster/juju/identify-leaders.py
View File

@ -17,13 +17,15 @@
from subprocess import check_output from subprocess import check_output
import yaml import yaml
out = check_output(['juju', 'status', 'kubernetes', '--format=yaml'])
cmd = ['juju', 'run', '--application', 'kubernetes', '--format=yaml', 'is-leader']
out = check_output(cmd)
try: try:
parsed_output = yaml.safe_load(out) parsed_output = yaml.safe_load(out)
model = parsed_output['services']['kubernetes']['units'] for unit in parsed_output:
for unit in model: standard_out = unit['Stdout'].rstrip()
if 'workload-status' in model[unit].keys(): unit_id = unit['UnitId']
if 'leader' in model[unit]['workload-status']['message']: if 'True' in standard_out:
print(unit) print(unit_id)
except: except:
pass pass

6
cluster/juju/util.sh
View File

@ -18,7 +18,7 @@
set -o errexit set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
set -o xtrace #set -o xtrace
UTIL_SCRIPT=$(readlink -m "${BASH_SOURCE}") UTIL_SCRIPT=$(readlink -m "${BASH_SOURCE}")
JUJU_PATH=$(dirname ${UTIL_SCRIPT}) JUJU_PATH=$(dirname ${UTIL_SCRIPT})
@ -54,7 +54,7 @@ function detect-master() {
function detect-nodes() { function detect-nodes() {
# Run the Juju command that gets the minion private IP addresses. # Run the Juju command that gets the minion private IP addresses.
local ipoutput local ipoutput
ipoutput=$(juju run --service kubernetes "unit-get private-address" --format=json) ipoutput=$(juju run --application kubernetes "unit-get private-address" --format=json)
# [ # [
# {"MachineId":"2","Stdout":"192.168.122.188\n","UnitId":"kubernetes/0"}, # {"MachineId":"2","Stdout":"192.168.122.188\n","UnitId":"kubernetes/0"},
# {"MachineId":"3","Stdout":"192.168.122.166\n","UnitId":"kubernetes/1"} # {"MachineId":"3","Stdout":"192.168.122.166\n","UnitId":"kubernetes/1"}
@ -91,7 +91,7 @@ function kube-up() {
tar xfz ${KUBECTL_DIR}/kubectl_package.tar.gz -C ${KUBECTL_DIR} tar xfz ${KUBECTL_DIR}/kubectl_package.tar.gz -C ${KUBECTL_DIR}
) )
# Export the location of the kubectl configuration file. # Export the location of the kubectl configuration file.
export KUBECONFIG="${KUBECTL_DIR}/config" export KUBECONFIG="${KUBECTL_DIR}/kubeconfig"
} }
function kube-down() { function kube-down() {