lp://qastaging/~mbruzek/charms/trusty/kubernetes/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/~kubernetes/charms/trusty/kubernetes/trunk at revision 12

Charles Butler (community): Approve on 2015-10-09

Diff: 412 lines (+162/-49)

13 files modified

Makefile (+2/-1)
README.md (+43/-21)
copyright (+1/-1)
files/kubelet.upstart.tmpl (+3/-3)
hooks/hooks.py (+19/-4)
hooks/install (+13/-12)
hooks/kubernetes_installer.py (+16/-2)
hooks/lib/__init__.py (+16/-0)
hooks/lib/registrator.py (+18/-4)
hooks/start (+1/-1)
python_requirements.txt (+1/-0)
unit_tests/lib/test_registrator.py (+15/-0)
unit_tests/test_hooks.py (+14/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

15. By Matt Bruzek on 2015-10-09

Changing the flake8 rules to not conflict with the verify-boilerplate k8s tool.

14. By Matt Bruzek on 2015-10-08

Added cleanup to unit_tests/.cache directory.

13. By Matt Bruzek on 2015-10-06

Fixing lint errors in merged code

12. By Matt Bruzek on 2015-10-05

Making changes from the github repository.

11. By Charles Butler on 2015-10-01

Update unit tests for lib/registrator.py

10. By Charles Butler on 2015-10-01

Handle socket errors for slow clouds during testing.

9. By Charles Butler on 2015-09-30

Re-introduce handling for a 409 response code when the k8's node has registered
with ETCD already. This happens during the etcd-relation-changed sequence often
and is not an error case, So halting the unit execution is not desireable.

8. By Charles Butler on 2015-09-24

Lint refactoring and updating of failing tests

7. By Matt Bruzek on 2015-07-17

Vendoring changes to the kubernetes charm for v1.0.0 release.

6. By Matt Bruzek on 2015-04-10

Removing binary bloat, config.yaml and config-changed.
Adding virtualenv to release target and reference env correctly.