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

Merge pull request #45289 from ktsakalozos/bug/fixbadrebase

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue 2017-05-03 12:07:56 -07:00 committed by GitHub
commit 8be8f90413
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