Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix lint errors in juju kubernetes master and e2e charms #45494

Merged
merged 2 commits into from
May 15, 2017
Merged

Fix lint errors in juju kubernetes master and e2e charms #45494

merged 2 commits into from
May 15, 2017

Conversation

ktsakalozos
Copy link
Contributor

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

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 8, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 8, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @ktsakalozos. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with @k8s-bot ok to test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels May 8, 2017
@spiffxp
Copy link
Member

spiffxp commented May 8, 2017

@k8s-bot ok to test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 8, 2017
@lazypower
Copy link
Contributor

@k8s-bot bazel test this

@k8s-bot verify test this

lazypower
lazypower suggested changes May 8, 2017
View reviewed changes
Copy link
Contributor

@lazypower lazypower left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had one check inline that I'd like clarification on before approval.

Otherwise this cleanup looks good. Thanks for the effort Kos!

cluster/juju/layers/kubernetes-master/Makefile Outdated
apt_prereqs:
@# Need tox, but don't install the apt version unless we have to (don't want to conflict with pip)
@which tox >/dev/null || (sudo pip install tox)
@sudo apt-get install -y python-pip python-flake8 python3-flake8 flake8
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is python pip required here? we're also calling pip install tox above with the possibility that pip isn't installed.

@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 8, 2017
@Cynerva
Copy link
Contributor

Cynerva commented May 12, 2017

Rather than including tox.ini in our charms, would it make more sense to open a bug against layer-snap? I don't think it's reasonable for layer-snap to break the charms that include it.

@thockin
Copy link
Member

thockin commented May 12, 2017

/approve

I have no context to weigh in on the questions

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 12, 2017
@lazypower
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 15, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chuckbutler, ktsakalozos, thockin

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 45070, 45821, 45732, 45494, 45789)

@k8s-github-robot k8s-github-robot merged commit fd5146f into kubernetes:master May 15, 2017
@Cynerva Cynerva mentioned this pull request May 15, 2017
Merged
k8s-github-robot pushed a commit that referenced this pull request May 16, 2017
Merge pull request #45832 from juju-solutions/gkk/fix-e2e-lint
ba69aa9 
Automatic merge from submit-queue (batch tested with PRs 44337, 45775, 45832, 45574, 45758)

Fix lint failures on kubernetes-e2e charm

**What this PR does / why we need it**:

This fixes a test failure on the kubernetes-e2e charm relating to tox and flake8:

```DEBUG:runner:/bin/sh: 1: flake8: not found```

**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**:

This is a follow-up to #45494 where the same thing was done for kubernetes-master.

**Release note**:

```release-note
Fix lint failures on kubernetes-e2e charm
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lazypower lazypower lazypower requested changes

Assignees

@lazypower lazypower

@mikedanese mikedanese

@thockin thockin

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@ktsakalozos @k8s-reviewable @k8s-ci-robot @spiffxp @lazypower @Cynerva @thockin @k8s-github-robot @mikedanese