/charm-kubernetes forked from kapilt/charm-kubernetes

Subordinate conversion #20

Merged
merged 2 commits into from Apr 10, 2015

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@chuckbutler @mbruzek
@chuckbutler
Collaborator

chuckbutler commented Apr 10, 2015

This branch has been tested repeatedly, and I have confidence this is ready for merging.

This is a significant change: it converts the Kubernetes charm to a subordinate, intended to be colocated with a docker/flannel-docker host charm.

chuckbutler added some commits Mar 27, 2015

@chuckbutler
Removed the overlay_type from relationship validation because this key 
was not being used in an obvious way, and terminated the relationships
usefulness. Leaving the kubernetes minions in an inconsistent state,
without the ability to start up.

This leads into a future modification request for an action to spin up
the minion service, and kick off the register command regardless of the
success of the relationship hook. The state of the service pool should
never be dependent on a relationship hook that doesn't get obviously
re-run.

Proposed:   juju do minion-start (this will kick off the appropriate
relationship hook to perform the registration)
2dc9ee3
@chuckbutler
Convert the service metadata to a subordinate, and add appropriate 
relationship to the docker-host

* Added Relationship: docker-host
2121c2d
@mbruzek
Collaborator

mbruzek commented Apr 10, 2015

+1 LGTM

mbruzek added a commit that referenced this pull request Apr 10, 2015

@mbruzek
Merge pull request #20 from chuckbutler/subordinate_conversion 
Subordinate conversion
453370a

@mbruzek mbruzek merged commit 453370a into whitmo:master Apr 10, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment