github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Remove offending code due to bad rebase

Browse Source
This commit is contained in:
Konstantinos Tsakalozos 2017-05-03 18:29:51 +03:00
parent df8551acd2
commit 7cf2b0b263
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
View File

@ -236,11 +236,10 @@ def setup_non_leader_authentication():
# the keys were not retrieved. Non-leaders have to retry. # the keys were not retrieved. Non-leaders have to retry.
return 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') set_state('authentication.setup')
@ -275,12 +274,6 @@ def get_keys_from_leader(keys):
with open(k, 'w+') as fp: with open(k, 'w+') as fp:
fp.write(contents) 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 return True