github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ingress and microbot

Browse Source
This commit is contained in:
Konstantinos Tsakalozos
2017-08-08 14:09:03 +03:00
parent 6e4814e948
commit 1c7f4cf363
6 changed files with 23 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View File

@@ -392,8 +392,6 @@ def render_and_launch_ingress():
'/root/cdk/addons/default-http-backend.yaml')
kubectl_manifest('delete',
'/root/cdk/addons/ingress-replication-controller.yaml') # noqa
kubectl_manifest('delete',
'/root/cdk/addons/ingress-replication-controller-service.yaml') # noqa
hookenv.close_port(80)
hookenv.close_port(443)
@@ -563,7 +561,7 @@ def launch_default_ingress_controller():
# Render the default http backend (404) replicationcontroller manifest
manifest = addon_path.format('default-http-backend.yaml')
render('default-backend.yml', manifest, context)
render('default-http-backend.yaml', manifest, context)
hookenv.log('Creating the default http backend.')
try:
kubectl('apply', '-f', manifest)
@@ -581,7 +579,7 @@ def launch_default_ingress_controller():
context['ingress_image'] = \
"docker.io/cdkbot/nginx-ingress-controller-s390x:0.9.0-beta.13"
manifest = addon_path.format('ingress-replication-controller.yaml')
render('nginx-ingress-controller.yml', manifest, context)
render('ingress-replication-controller.yaml', manifest, context)
hookenv.log('Creating the ingress replication controller.')
try:
kubectl('apply', '-f', manifest)
@@ -591,17 +589,6 @@ def launch_default_ingress_controller():
hookenv.close_port(80)
hookenv.close_port(443)
return
manifest = addon_path.format('ingress-replication-controller-service.yaml')
render('nginx-ingress-controller-service.yml', manifest, context)
hookenv.log('Creating the ingress replication controller service.')
try:
kubectl('apply', '-f', manifest)
except CalledProcessError as e:
hookenv.log(e)
hookenv.log('Failed to create ingress controller service. Will attempt again next update.') # noqa
hookenv.close_port(80)
hookenv.close_port(443)
return
set_state('kubernetes-worker.ingress.available')
hookenv.open_port(80)