[JUJU-544] Remove redundant ifCredentialValid wrappers from model manifolds #13684
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
SimonRichardson
approved these changes
Feb 1, 2022
There was a problem hiding this comment.
Weirdly I was speaking to @achilleasa about the usefulness of these the other day.
|
|
manadart
changed the title
manadart
changed the title
manadart
force-pushed
the
2.9-model-manifolds-redundant-cred-valid
branch
2 times, most recently
from
16c6170 to
8de508a
Compare
depending on an environ-tracker. This wrapper is implied by that dependency.
manadart
force-pushed
the
2.9-model-manifolds-redundant-cred-valid
branch
from
8de508a to
79c52f5
Compare
jameinel
approved these changes
May 12, 2022
|
|
Merged
jujubot
added a commit
that referenced
this pull request
May 19, 2022
#14050 Merge 2.9, but revert the commit which deleted secrets from 2.9 #13996 [JUJU-1019] Bug 1969929 bundle revision only #14019 [JUJU-1082] Fix inst filtering to avoid arch mismatches #14020 [JUJU-1069] CI improvements #14021 [JUJU-1079] Update volumes if statefulset spec changed; #13684 [JUJU-544] Remove redundant ifCredentialValid wrappers from model manifolds #14002 [JUJU-1054] Ensure to convert pod status to juju status consistent across operators #14024 Juju 1061 add machine private key #14026 [JUJU-1077] Refactor unit tests #14033 [JUJU-1103] Add --cert option to microk8s refresh-cert #13546 [JUJU-299] Store unit CharmURL as a string reference #14025 [JUJU-1089] Deprecated note for --no-download flag in create-backup #14023 [JUJU-1070] Fix/lp 1971560 #14027 Fix K8s application removal in pre-initialized error state #14030 [JUJU-1099] Restore "Store unit CharmURL as a string reference" #14037 [JUJU-1109] Fix encoding for interfaceAddressDisplay, used by the network-get hook tool #14028 [JUJU-1091] Cloud-init wait for IP #14029 [JUJU-1070] Use first 6 digits for short model UUID; #14034 [JUJU-1070] Use first 6 digits for short model UUID; #14042 Use default arch when provisioning a machine #14045 Update references to jujucharms.com #14046 Address consistency in use of id/Id/ID in command line output #14047 Adjust the default log level for installing/starting a service ``` # Conflicts: # apiserver/facades/controller/firewaller/firewaller.go # apiserver/facades/controller/firewaller/firewaller_test.go # apiserver/facades/controller/firewaller/firewaller_unit_test.go # apiserver/facades/controller/remoterelations/mock_test.go # apiserver/facades/controller/remoterelations/remoterelations_test.go # caas/kubernetes/provider/application/application_test.go # caas/kubernetes/provider/k8s.go # go.mod # go.sum # mongo/mongo_test.go # rpc/params/apierror.go # snap/snapcraft.yaml # version/version.go # worker/uniter/operation/interface.go # worker/uniter/operation/runhook_test.go # worker/uniter/secrets/rotatesecrets.go # worker/uniter/secrets/rotatesecrets_test.go ``` ## QA steps See PRs [JUJU-1019]: https://warthogs.atlassian.net/browse/JUJU-1019?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-1082]: https://warthogs.atlassian.net/browse/JUJU-1082?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-1069]: https://warthogs.atlassian.net/browse/JUJU-1069?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-1079]: https://warthogs.atlassian.net/browse/JUJU-1079?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-544]: https://warthogs.atlassian.net/browse/JUJU-544?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-1054]: https://warthogs.atlassian.net/browse/JUJU-1054?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-1077]: https://warthogs.atlassian.net/browse/JUJU-1077?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-1103]: https://warthogs.atlassian.net/browse/JUJU-1103?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-299]: https://warthogs.atlassian.net/browse/JUJU-299?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-1089]: https://warthogs.atlassian.net/browse/JUJU-1089?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-1070]: https://warthogs.atlassian.net/browse/JUJU-1070?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-1099]: https://warthogs.atlassian.net/browse/JUJU-1099?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-1109]: https://warthogs.atlassian.net/browse/JUJU-1109?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-1091]: https://warthogs.atlassian.net/browse/JUJU-1091?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
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.
We don't need to wrap model manifolds with
ifCredentialValidwhen they depend on the environ tracker worker. That worker is already gated on credential validity, so there is no need to explicitly wrap such manifolds.The exception is the model upgrader, which may be supplied an environ based on whether it is running on the model leader (holder of the singular lease).
QA steps
The tests for this package pass. They verify all dependencies, including transitive ones. The fact that no alteration is required, verifies that the dependency graph is unchanged.
Documentation changes
None.
Bug reference
N/A