Skip to content

K
k3s
Commit fd5146f1 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #45494 from ktsakalozos/bug/fix-lint

Automatic merge from submit-queue (batch tested with PRs 45070, 45821, 45732, 45494, 45789) Fix lint errors in juju kubernetes master and e2e charms **What this PR does / why we need it**: Fixes style error in the Juju charms **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**: ``` Code style fixes in Juju charms ```
parents 958bbaaa e4e386d3
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 5 deletions
cluster/juju/layers/kubernetes-e2e/reactive/kubernetes_e2e.py
View file @ fd5146f1
...@@ -14,14 +14,11 @@ ...@@ -14,14 +14,11 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import os
from charms import layer from charms import layer
from charms.layer import snap from charms.layer import snap
from charms.reactive import hook from charms.reactive import hook
from charms.reactive import is_state from charms.reactive import is_state
from charms.reactive import remove_state
from charms.reactive import set_state from charms.reactive import set_state
from charms.reactive import when from charms.reactive import when
from charms.reactive import when_not from charms.reactive import when_not
...@@ -30,7 +27,6 @@ from charmhelpers.core import hookenv ...@@ -30,7 +27,6 @@ from charmhelpers.core import hookenv
from shlex import split from shlex import split
from subprocess import call
from subprocess import check_call from subprocess import check_call
from subprocess import check_output from subprocess import check_output
......
cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
View file @ fd5146f1
...@@ -441,7 +441,6 @@ def addons_ready(): ...@@ -441,7 +441,6 @@ def addons_ready():
return False return False
@when('loadbalancer.available', 'certificates.ca.available', @when('loadbalancer.available', 'certificates.ca.available',
'certificates.client.cert.available') 'certificates.client.cert.available')
def loadbalancer_kubeconfig(loadbalancer, ca, client): def loadbalancer_kubeconfig(loadbalancer, ca, client):
......
cluster/juju/layers/kubernetes-master/tox.ini 0 → 100644
View file @ fd5146f1
[tox]
skipsdist=True
envlist = py34, py35
skip_missing_interpreters = True
[testenv]
commands = py.test -v
deps =
-r{toxinidir}/requirements.txt
[flake8]
exclude=docs
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment