Merge pull request #45289 from ktsakalozos/bug/fixbadrebase

Automatic merge from submit-queue (batch tested with PRs 45283, 45289, 45248, 44295) Remove offending code due to bad rebase **What this PR does / why we need it**: Fix bug introduced by bad rebasing **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**: ``` NONE ```

Merge pull request #45289 from ktsakalozos/bug/fixbadrebase
8be8f904 · Kubernetes Submit Queue · GitHub · 99f2cadc · 7cf2b0b2 · 8be8f904
Commit 8be8f904 authored May 03, 2017 by Kubernetes Submit Queue Committed by GitHub May 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 11 deletions

kubernetes_master.py ...ju/layers/kubernetes-master/reactive/kubernetes_master.py +4 -11

No files found.
--- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
+++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
@@ -236,11 +236,10 @@ def setup_non_leader_authentication():
        # the keys were not retrieved. Non-leaders have to retry.
        return
-    api_opts.add('--basic-auth-file', basic_auth)
+    api_opts.add('basic-auth-file', basic_auth)
-    api_opts.add('--token-auth-file', known_tokens)
+    api_opts.add('token-auth-file', known_tokens)
-    api_opts.add('--service-cluster-ip-range', service_cidr())
+    api_opts.add('service-account-key-file', service_key)
-    api_opts.add('--service-account-key-file', service_key)
+    controller_opts.add('service-account-private-key-file', service_key)
-    controller_opts.add('--service-account-private-key-file', service_key)
    set_state('authentication.setup')
@@ -275,12 +274,6 @@ def get_keys_from_leader(keys):
            with open(k, 'w+') as fp:
                fp.write(contents)
-    api_opts.add('basic-auth-file', basic_auth)
-    api_opts.add('token-auth-file', known_tokens)
-    api_opts.add('service-account-key-file', service_key)
-    controller_opts.add('service-account-private-key-file', service_key)
-    set_state('authentication.setup')
    return True