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

Backport k8s install hook #11424

Merged
merged 4 commits into from Apr 7, 2020
Merged

Conversation

hmlanigan
Copy link
Member

Description of change

Backport of PR 11119:

Enable install hook for k8s charms while skipping the install operation done by the uniter. It is not required due to the k8s pods.

Do not block storage hooks based on the install hook not having been run for CAAS units, other wise it will hang if there is storage.

QA steps

Please see qa steps from #11119

Documentation changes

https://discourse.juju.is/t/install-hook-now-called-for-kubernetes-charms/2585/2

Bug reference

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

Part of uniter++ work.
Ensure that the start hook is run for CAAS units with storage.
Add tests for CAAS units, wait for started to attach storage.
@hmlanigan
Copy link
Member Author

Ran QA with no issues.

@hmlanigan
Copy link
Member Author

$$merge$$

@hmlanigan
Copy link
Member Author

fix for:
worker/uniter/storage/attachments_test.go:313:9: undefined: life

@hmlanigan
Copy link
Member Author

$$merge$$

@jujubot jujubot merged commit 7c65e6f into juju:2.7 Apr 7, 2020
@hmlanigan hmlanigan deleted the backport-k8s-install-hook branch April 7, 2020 17:04
@hmlanigan hmlanigan restored the backport-k8s-install-hook branch April 7, 2020 22:04
@wallyworld wallyworld mentioned this pull request Apr 8, 2020
jujubot added a commit that referenced this pull request Apr 8, 2020
#11429

## Description of change

Merge 2.7 with these PRs:

#11415 destroy extra models created in migration CI test
#11421 fix panic migrating application with no bindings
#11424 backport k8s install hook
#11426 add 2.7.6 upgrade step to fix uniter state files
#11427 fix regression deploying k8s charms

## QA steps

run unit tests
@hmlanigan hmlanigan deleted the backport-k8s-install-hook branch April 21, 2020 12:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants