lp:~mbruzek/charms/trusty/kubernetes-master/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~kubernetes/charms/trusty/kubernetes-master/trunk at revision 14

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

Diff: 979 lines (+383/-164)

16 files modified

Makefile (+2/-1)
README.md (+42/-17)
config.yaml (+24/-0)
copyright (+1/-1)
files/apiserver.upstart.tmpl (+8/-9)
files/controller-manager.upstart.tmpl (+1/-8)
files/distribution.conf.tmpl (+5/-1)
files/nginx.conf.tmpl (+25/-37)
files/scheduler.upstart.tmpl (+1/-8)
hooks/__init__.py (+16/-0)
hooks/hooks.py (+118/-26)
hooks/install.py (+35/-10)
hooks/kubernetes_installer.py (+17/-3)
hooks/setup.py (+14/-0)
unit_tests/kubernetes_installer_test.py (+25/-13)
unit_tests/test_install.py (+49/-30)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

19. By Matt Bruzek on 2015-10-09

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

18. By Matt Bruzek on 2015-10-08

Added .cache to clean make target, fixed failing tests.

17. By Matt Bruzek on 2015-10-08

Fixing multiple test failures found in testing.

16. By Matt Bruzek on 2015-10-07

Fixing import and indent issues found in testing.

15. By Matt Bruzek on 2015-10-06

Fixing lint errors with merged code.

14. By Matt Bruzek on 2015-10-05

Changes from the github version of kubernetes-master charm.

13. By Charles Butler on 2015-09-28

Refactor the update_rc_files method and supporting test to actually point to a non-existant path for testing purposes. The expected raise was not being reached in CI due to bundletester being run with sudo, and the code execution always checking for only ubuntu and root.

12. By Charles Butler on 2015-09-24

Refactors based on lint results, and updates unit_tests for new mock syntax

11. By Charles Butler on 2015-09-22

Added docker to installation dependency list for CWR

10. By Matt Bruzek on 2015-08-17

[lazypower] The upstream Kubernetes repository has changed from GoogleCloudPlatform to kubernetes.