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

Fixing some flake8 issues

Browse Source
This commit is contained in:
Mike Wilson 2018-01-22 14:54:58 -05:00
parent b04a88cc9e
commit a22358e525
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -630,16 +630,18 @@ def launch_default_ingress_controller():
''' Launch the Kubernetes ingress controller & default backend (404) ''' ''' Launch the Kubernetes ingress controller & default backend (404) '''
config = hookenv.config() config = hookenv.config()
# need to test this in case we get in here from a config change to the image # need to test this in case we get in
# here from a config change to the image
if not config.get('ingress'): if not config.get('ingress'):
return return
context = {} context = {}
context['arch'] = arch() context['arch'] = arch()
addon_path = '/root/cdk/addons/{}' addon_path = '/root/cdk/addons/{}'
context['defaultbackend_image'] = config.get('default-backend-image') context['defaultbackend_image'] = config.get('default-backend-image')
if context['defaultbackend_image'] == "" or context['defaultbackend_image'] == "auto": if (context['defaultbackend_image'] == "" or
context['defaultbackend_image'] == "auto"):
if context['arch'] == 's390x': if context['arch'] == 's390x':
context['defaultbackend_image'] = \ context['defaultbackend_image'] = \
"gcr.io/google_containers/defaultbackend-s390x:1.4" "gcr.io/google_containers/defaultbackend-s390x:1.4"
@ -668,7 +670,7 @@ def launch_default_ingress_controller():
"docker.io/cdkbot/nginx-ingress-controller-s390x:0.9.0-beta.13" "docker.io/cdkbot/nginx-ingress-controller-s390x:0.9.0-beta.13"
else: else:
context['ingress_image'] = \ context['ingress_image'] = \
"gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.15" "gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.15" # noqa
context['juju_application'] = hookenv.service_name() context['juju_application'] = hookenv.service_name()
manifest = addon_path.format('ingress-daemon-set.yaml') manifest = addon_path.format('ingress-daemon-set.yaml')
render('ingress-daemon-set.yaml', manifest, context) render('ingress-daemon-set.yaml', manifest, context)