Merge pull request #53203 from Cynerva/gkk/fix-lint

Automatic merge from submit-queue (batch tested with PRs 49249, 53203, 53209, 53208, 53177). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix lint error on kubernetes-worker **What this PR does / why we need it**: This fixes a lint error on kubernetes-worker that's causing problems in our CI builds. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #53203 from Cynerva/gkk/fix-lint
89123504 · Kubernetes Submit Queue · GitHub · 22ae7508 · afd01971 · 89123504
Commit 89123504 authored Sep 28, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

kubernetes_worker.py ...ju/layers/kubernetes-worker/reactive/kubernetes_worker.py +4 -2

No files found.
--- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
+++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
@@ -567,9 +567,11 @@ def launch_default_ingress_controller():
        return
    # Render the ingress replication controller manifest
-    context['ingress_image'] = "gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.13"
+    context['ingress_image'] = \
+        "gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.13"
    if arch() == 's390x':
-        context['ingress_image'] = "docker.io/cdkbot/nginx-ingress-controller-s390x:0.9.0-beta.13"
+        context['ingress_image'] = \
+            "docker.io/cdkbot/nginx-ingress-controller-s390x:0.9.0-beta.13"
    manifest = addon_path.format('ingress-replication-controller.yaml')
    render('ingress-replication-controller.yaml', manifest, context)
    hookenv.log('Creating the ingress replication controller.')