/juju

Support adding CAAS units #8180

Merged
merged 4 commits into from Dec 6, 2017

Conversation

Reviewers

@wallyworld wallyworld

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@axw @jujubot @wallyworld
@axw
Member

axw commented Dec 6, 2017

Description of change

Fixes to state and the Application facade to support "juju add-unit" in CAAS models.

  • Adding a CAAS application no longer ignores the NumUnits parameter.
  • The state/stateenvirons policy returns "not implemented" for CAAS models. TODO(caas) added where we should add policies later.
  • The add-unit facade method doesn't attempt to assign CAAS units to machines

QA steps

  1. juju bootstrap localhost
  2. juju add-caas kubernetes k8s
  3. juju add-model k8s k8s
  4. juju deploy path/to/gitlab
  5. watch kubectl get all
    (the operator should come up, and set a container spec; the unit provisioner should then create a pod)
  6. juju add-unit gitlab
    (another pod should be created)

Documentation changes

None.

Bug reference

None.

axw added some commits Dec 6, 2017

@axw
state/stateenvirons: NotImplemented for CAAS
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
1b0b46b
@axw
state: honour NumUnits in CAAS AddApplication
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
8a972b6
@axw
facades/.../application: simplify tests 
Simplify tests by not recording the ModelTag
method calls. It's not that interesting.
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
465fd42
@axw
facades/.../application: don't assign CAAS units 
When adding units to a CAAS application, don't
attempt to assign them to machines. When removing
CAAS units or applications, don't attempt to
destroy/detach storage.
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
2a94e54
@axw
Member

axw commented Dec 6, 2017

$$merge$$
@jujubot
Contributor

jujubot commented Dec 6, 2017

Status: merge request accepted. Url: http://ci.jujucharms.com/job/github-merge-juju

@jujubot jujubot merged commit 39243aa into juju:develop Dec 6, 2017
1 check failed

1 check failed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment