Fix pod commands

This commit is contained in:
2018-04-21 15:30:09 -05:00
parent 41c81883f5
commit 3e932aa36e
3 changed files with 17 additions and 10 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
# Only run in root dir
[ "$(basename $(pwd))" != "ethereum-cluster" ] && return 0
[ "$(basename $(pwd))" != "bootnode" ] && return 0
export KUBECONFIG=`pwd`/config/cluster.yaml
+2 -2
View File
@@ -27,11 +27,11 @@ class Bootnode(object):
pass
def list_pods(self, network=None):
for pod in self.gcloud.list_pods(network=network):
for pod in self.kube.list_pods(network=network):
print('{0}\t{1}\t{2}'.format(pod.name, pod.phase, pod.ip))
def last_pod(self, network=None):
pod = self.gcloud.last_pod(network=network)
pod = self.kube.last_pod(network=network)
print('{0}\t{1}\t{2}'.format(pod.name, pod.phase, pod.ip))
def scale_up(args):
+14 -7
View File
@@ -3,7 +3,19 @@ import sys
import argparse
from bootnode import Bootnode
bootnode = Bootnode()
def run_command(cmd, args):
bootnode = Bootnode()
# Get argument names
keys = [k for k in dir(args) if not k.startswith('_') and not k == 'command']
# Create kwargs from args specified
kwargs = dict(map(lambda k: (k, getattr(args, k)), keys))
# Call relevant method on Bootnode
getattr(bootnode, cmd)(**kwargs)
if __name__ == '__main__':
parser = argparse.ArgumentParser(description='Cluster management commands')
@@ -17,9 +29,6 @@ if __name__ == '__main__':
last_parser = subparsers.add_parser('disk', help='Last disk')
last_parser.set_defaults(command='last_disk')
update_parser = subparsers.add_parser('disk-update', help='Update disk')
update_parser.set_defaults(command='update_disk')
# Snapshots
list_parser = subparsers.add_parser('snapshots', help='List snapshots')
list_parser.set_defaults(command='list_snapshots')
@@ -53,6 +62,4 @@ if __name__ == '__main__':
parser.print_help()
sys.exit(1)
keys = [k for k in dir(args) if not k.startswith('_') and not k == 'command']
kwargs = dict(map(lambda k: (k, getattr(args, k)), keys))
getattr(bootnode, cmd)(**kwargs)
run_command(cmd, args)