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.

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

Adds upgrade worker to model agent #11693

Merged
merged 2 commits into from
Jul 2, 2020
Merged

Conversation

tlm
Copy link
Member

@tlm tlm commented Jun 10, 2020

Please provide the following details to expedite Pull Request review:

Checklist

  • Checked if it requires a pylibjuju change?
  • Added integration tests for the PR?
  • Added or updated doc.go related to packages changed?
  • Do comments answer the question of why design decisions were made?

Description of change

Please replace with a description about why this change is needed, along with a description of what changed?

QA steps

Please replace with how we can verify that the change works?

cd tests && ./main.sh caasadmission

2nd

export DOCKER_USERNAME=<your-dockerhub-username>
make install operator-image microk8s-operator-update push-operator-image
juju bootstrap microk8s
# Check that the model agent has come up in the controller namespace
juju add-model test
# Check that the model agent has come up in the test namespace

export JUJU_BUILD_NUMBER=1
make install operator-image microk8s-operator-update push-operator-image
juju upgrade-controller --agent-stream=develop --agent-version=2.8.1.1
# Wait for controller to restart and verify that the new controller that comes up has the new image and version. The model agent has the correct version and image.

Documentation changes

Please replace with any notes about how it affects current user workflow? CLI? API?

Bug reference

https://bugs.launchpad.net/juju/+bug/1883188

@hpidcock hpidcock added the 2.8 label Jun 11, 2020
@tlm tlm force-pushed the model-admission-upgrade branch 2 times, most recently from ba7ba32 to b50c1c4 Compare June 17, 2020 23:17
@tlm tlm force-pushed the model-admission-upgrade branch from b50c1c4 to a6c5b17 Compare June 25, 2020 23:34
@tlm tlm marked this pull request as ready for review June 28, 2020 22:53
@tlm tlm force-pushed the model-admission-upgrade branch 4 times, most recently from 7d2e1cf to 8afe00a Compare June 29, 2020 22:37
Copy link
Member

@wallyworld wallyworld left a comment

Choose a reason for hiding this comment

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

A few small things
QA steps don't mention regression testing upgrades of app operators, assume that was done.
Also, we'll need release notes for how to deal with 2.8.0 upgrades

caas/kubernetes/provider/controller_upgrade_test.go Outdated Show resolved Hide resolved
caas/kubernetes/provider/operator_upgrade.go Show resolved Hide resolved
caas/kubernetes/provider/upgrade.go Show resolved Hide resolved
caas/kubernetes/provider/upgrade.go Outdated Show resolved Hide resolved
Comment on lines +16 to +18
JujudOCINamespace = "jujusolutions"
JujudOCIName = "jujud-operator"
JujudbOCIName = "juju-db"
Copy link
Member

Choose a reason for hiding this comment

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

These shouldn't be exported.
The PR uses them in tests but the tests should use string literals so that if ever we change these consts, the tests will break and we fix the test; it makes us aware of the impact of any change and think about the consequences etc

Copy link
Member Author

Choose a reason for hiding this comment

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

The tests wouldn't break if we changed these. I am just trying to keep it consistent. Still want them changed?

@tlm tlm force-pushed the model-admission-upgrade branch 4 times, most recently from 534e190 to 7031dee Compare July 2, 2020 03:54
@tlm tlm force-pushed the model-admission-upgrade branch from 7031dee to f187d71 Compare July 2, 2020 08:45
@tlm
Copy link
Member Author

tlm commented Jul 2, 2020

$$merge$$

@jujubot jujubot merged commit 07e0311 into juju:2.8 Jul 2, 2020
@manadart manadart mentioned this pull request Jul 2, 2020
jujubot added a commit that referenced this pull request Jul 2, 2020
#11795

Merge from 2.8 to bring forward:
- #11794 from manadart/2.8-address-conversion-rework
- #11789 from SimonRichardson/actions-list-output
- #11693 from tlm/model-admission-upgrade
- #11785 from manadart/2.8-machiner-lld-prep
- #11790 from achilleasa/2.8-filter-non-live-relations-from-relation-ids-output
- #11792 from wallyworld/add-centos8
- #11791 from howbazaar/2.8-fix-intermittent-status-tests
- #11787 from hmlanigan/add-k8s-error-output
- #11780 from SimonRichardson/api-schema-admin
- #11773 from tlm/json-num
- #11783 from wallyworld/merge-2.7-20200701
- #11776 from ycliuhw/lp-1882149
- #11778 from manadart/2.8-instance-poller-dev-provider-id
- #11765 from achilleasa/2.8-enable-relation-list-to-show-remote-application
- #11768 from ycliuhw/fix/CAAS-CI-LB-GET
- #11770 from hmlanigan/unicode-vs-str
- #11769 from hmlanigan/unicode-vs-str
- #11766 from hmlanigan/autoload-cred-lxd
@manadart
Copy link
Member

Merged without a description?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants