3.1 into 3.2 #15866
Merged
3.1 into 3.2 #15866
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
These versions of Ununtu are no longer supported in Juju 3 This check is handled by seriesSelector. Ensure that is is always used. A side effect is that this brings the bundle deployer in line with deploying charms with 'juju deploy'
juju#15852 Previous error message was ambiguous, especially with large bundles that have many applications/charmhub charms deployed. ## QA steps Unit tests and/or refresh bundle that downgrades a charmhub charm. ## Documentation changes N/A ## Bug reference https://bugs.launchpad.net/juju/+bug/1999700
juju#15854 A previous PR disabled the caasapplicationprovisioner to prevent it from dealing with controller concerns (since the controller app is a sidecar of the juju controller pods). This rolls that back partially to allow the caasapplicationprovisioner to work in a readonly mode, only updating status as it sees changes. ## QA steps Bootstrap k8s, switch to controller model, check status of juju controller app and unit is nice. ## Documentation changes N/A ## Bug reference N/A
juju#15849 This PR ensures: - the secret backend endpoint read-only; - disallowed to change the backend name if the backend is in use for any model; ## Checklist - [x] Code style: imports ordered, good names, simple structure, etc - [x] Comments saying why design decisions were made - [x] Go unit tests, with comments saying what you're testing - [ ] ~[Integration tests](https://github.com/juju/juju/tree/main/tests), with comments saying what you're testing~ - [ ] ~[doc.go](https://discourse.charmhub.io/t/readme-in-packages/451) added or updated in changed packages~ ## QA steps ```sh juju add-secret-backend myvault vault --config ./vault.yaml juju model-config secret-backend=myvault juju deploy snappass-test juju exec --unit snappass-test/0 -- secret-add owned-by=easyrsa-app secret://025ca458-bb1c-4640-8ba4-15ba62fa7559/cih7fueffbas7akd0lng juju update-secret-backend myvault name=myvault2 ERROR cannot rename a secret backend that is in use juju update-secret-backend myvault endpoint=http://10.180.97.1:8201 ERROR invalid config for provider "vault": cannot change immutable field "endpoint" ``` ## Documentation changes No ## Bug reference No
juju#15855 A couple of secret CI fixes. Drive-by: we should ignore vault non-reachable network error during model teardown.
Occassionally we fail to remove the secondary controller in the cross_controller cmr test. Explicilty remoing the SAAS before destroying helps to resolve this
…_in_cmr_test juju#15857 Occasionally we fail to remove the secondary controller in the cross_controller cmr test. Explicilty remoing the SAAS before destroying helps to resolve this https://jenkins.juju.canonical.com/job/test-cmr-test-offer-consume-lxd/731/ ## Checklist - ~[ ] Code style: imports ordered, good names, simple structure, etc~ - [x] Comments saying why design decisions were made - ~[ ] Go unit tests, with comments saying what you're testing~ - [x] [Integration tests](https://github.com/juju/juju/tree/main/tests), with comments saying what you're testing - ~[ ] [doc.go](https://discourse.charmhub.io/t/readme-in-packages/451) added or updated in changed packages~ ## QA steps ```sh ./main.sh -v -c lxd -p lxd cmr ```
juju#15861 Merges: - juju#15852 - juju#15857 No conflicts
…ted_series_in_bundles juju#15825 These versions of Ubuntu are no longer supported in Juju 3 This check is handled by seriesSelector. Ensure that is is always used. A side effect is that this brings the bundle deployer in line with deploying charms with 'juju deploy' ## Checklist - [x] Code style: imports ordered, good names, simple structure, etc - ~[ ] Comments saying why design decisions were made~ - [x] Go unit tests, with comments saying what you're testing - ~[ ] [Integration tests](https://github.com/juju/juju/tree/main/tests), with comments saying what you're testing~ - ~[ ] [doc.go](https://discourse.charmhub.io/t/readme-in-packages/451) added or updated in changed packages~ ## QA steps Verify we can no longer deploy bundles with series bionic ``` $ cat bundle1.yaml name: tiny applications: ubuntu-plus: charm: ubuntu scale: 1 series: bionic $ juju deploy ./bundle1.yaml Located charm "ubuntu" in charm-hub, channel stable Executing changes: - upload charm ubuntu from charm-hub for series bionic with architecture=amd64 ERROR cannot deploy bundle: failed to upload charm "ubuntu": series: bionic not supported ``` Verify we can still properly deploy complex bundles ```sh juju deploy kubeflow ``` ## Bug reference https://bugs.launchpad.net/juju/+bug/2025163
|
/merge |
1 similar comment
|
/merge |
jujubot
added a commit
that referenced
this pull request
Jul 7, 2023
#15881 Merges: - #15845 - #15852 - #15854 - #15849 - #15855 - #15857 - #15861 - #15862 - #15825 - #15866 - #15863 - #15870 - #15871 - #15872 - #15873 - #15874 - #15875 One substantial conflict in `cmd/juju/application/deployer/bundlehandler.go` & `cmd/juju/application/deployer/bundlehandler_test.go`, resulting in failing unit tests. The conflict relates to this PR: - #15825 These were fixed by the two tops commits ### QA Steps Ensure all unit tests pass ``` go test github.com/juju/juju/cmd/juju/application/deployer go test github.com/juju/juju/core/charm go test github.com/juju/juju/apiserver/facades/client/application ``` Ensure we can deploy a complex bundle ``` juju deploy kubeflow ```
Merged
jujubot
added a commit
that referenced
this pull request
Jul 11, 2023
#15896 Forward ports: - #15845 - #15725 - #15852 - #15854 - #15849 - #15855 - #15857 - #15861 - #15862 - #15860 - #15864 - #15825 - #15866 - #15863 - #15870 - #15871 - #15872 - #15873 - #15874 - #15876 - #15875 - #15881 - #15727 - #15883 - #15884 - #15880 - #15879 - #15886 - #15887 - #15877 - #15888 - #15893 - #15894 Conflicts: - cmd/juju/ssh/debugcode_test.go - cmd/juju/ssh/debughooks_test.go - cmd/juju/ssh/scp_unix_test.go - cmd/juju/ssh/ssh_machine.go - cmd/juju/ssh/ssh_machine_test.go - cmd/juju/ssh/ssh_unix_test.go - worker/dbaccessor/worker.go - caas/kubernetes/provider/k8s_test.go - caas/kubernetes/provider/operator_test.go - caas/kubernetes/provider/package_test.go - caas/kubernetes/provider/rbac.go - cmd/juju/application/deployer/bundlehandler.go - cmd/juju/application/deployer/bundlehandler_test.go - cmd/jujud/agent/model/manifolds.go - core/bundle/changes/changes.go - worker/caasapplicationprovisioner/application.go - worker/caasapplicationprovisioner/application_test.go - worker/caasapplicationprovisioner/mock_test.go
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merges:
One conflict in
cmd/juju/application/deployer/bundlehandler.go