github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #52986 from juju-solutions/bug/fix-lint 

Automatic merge from submit-queue. 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 oversized comment line, lint error

**What this PR does / why we need it**: fix style error blocking build

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: 

**Special notes for your reviewer**:

**Release note**:

```NONE
```
pull/6/head
Kubernetes Submit Queue 2017-09-25 08:27:26 -07:00 committed by GitHub
parent 20fd96a161 90e15b4bea
commit b5ef5d5791
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -973,7 +973,8 @@ def configure_apiserver():
admission_control.remove('Initializers') admission_control.remove('Initializers')
api_opts.add('admission-control', ','.join(admission_control), strict=True) api_opts.add('admission-control', ','.join(admission_control), strict=True)
# Add operator-provided arguments, this allows operators to override defaults # Add operator-provided arguments, this allows operators
# to override defaults
for arg in to_add: for arg in to_add:
hookenv.log('Adding option: {} {}'.format(arg[0], arg[1])) hookenv.log('Adding option: {} {}'.format(arg[0], arg[1]))
# Make sure old value is gone # Make sure old value is gone