openstack/kolla-kubernetes
Code Issues Proposed changes

Merge "Allow kubectl to use its own configured endpoint for kube API"

Browse Source
This commit is contained in:
Jenkins 2016-07-05 17:50:53 +00:00 committed by Gerrit Code Review
commit 7d92770b9e
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kolla_kubernetes/config.py
View File

@ -46,7 +46,6 @@ CONF.register_cli_opts(kolla_opts, kolla_opt_group)
CONF.register_opts(kolla_opts, kolla_opt_group)
kubernetes_opts = [
cfg.StrOpt('host', default='http://localhost:8080'),
cfg.StrOpt('kubectl_path', default='kubectl')
]
kubernetes_opt_group = cfg.OptGroup(name='kolla_kubernetes')

16
kolla_kubernetes/service.py
View File

@ -180,12 +180,11 @@ def kill_service(service_name, variables=None):
def _bootstrap_instance(directory, service_name):
server = "--server=" + CONF.kolla_kubernetes.host
pod_list = service_definition.get_pod_definition(service_name)
for pod in pod_list:
container_list = service_definition.get_container_definition(pod)
for container in container_list:
cmd = [CONF.kolla_kubernetes.kubectl_path, server, "create",
cmd = [CONF.kolla_kubernetes.kubectl_path, "create",
"configmap", '%s-configmap' % container]
for f in PathFinder.find_kolla_service_config_files(container):
cmd = cmd + ['--from-file=%s=%s' % (
@ -196,19 +195,18 @@ def _bootstrap_instance(directory, service_name):
LOG.info('Command : %r' % cmd)
subprocess.call(cmd)
cmd = [CONF.kolla_kubernetes.kubectl_path, server, "create", "-f",
cmd = [CONF.kolla_kubernetes.kubectl_path, "create", "-f",
directory]
LOG.info('Command : %r' % cmd)
subprocess.call(cmd)
def _deploy_instance(directory, service_name, pod_list):
server = "--server=" + CONF.kolla_kubernetes.host
pod_list = service_definition.get_pod_definition(service_name)
for pod in pod_list:
container_list = service_definition.get_container_definition(pod)
for container in container_list:
cmd = [CONF.kolla_kubernetes.kubectl_path, server, "create",
cmd = [CONF.kolla_kubernetes.kubectl_path, "create",
"configmap", '%s-configmap' % container]
for f in PathFinder.find_kolla_service_config_files(container):
cmd = cmd + ['--from-file=%s=%s' % (
@ -219,25 +217,23 @@ def _deploy_instance(directory, service_name, pod_list):
LOG.info('Command : %r' % cmd)
subprocess.call(cmd)
cmd = [CONF.kolla_kubernetes.kubectl_path, server, "create", "-f",
cmd = [CONF.kolla_kubernetes.kubectl_path, "create", "-f",
directory]
LOG.info('Command : %r' % cmd)
subprocess.call(cmd)
def _delete_instance(directory, service_name, pod_list):
server = "--server=" + CONF.kolla_kubernetes.host
for pod in pod_list:
container_list = service_definition.get_container_definition(pod)
for container in container_list:
cmd = [CONF.kolla_kubernetes.kubectl_path, server, "delete",
cmd = [CONF.kolla_kubernetes.kubectl_path, "delete",
"configmap", '%s-configmap' % container]
LOG.info('Command : %r' % cmd)
subprocess.call(cmd)
cmd = [CONF.kolla_kubernetes.kubectl_path, server, "delete", "-f",
cmd = [CONF.kolla_kubernetes.kubectl_path, "delete", "-f",
directory]
LOG.info('Command : %r' % cmd)
subprocess.call(cmd)