Skip to content

Commit 624175a

Browse files
authored
Merge pull request juju#16912 from hpidcock/jujud-controller-4
juju#16912 With moving to the jujud-controller snap and a new process for development build/upgrade process, it makes sense to bifurcate the upgrade-model and upgrade-controller commands because they will fundamentally serve two different purposes into the future. Since `--build-agent` was only supported on controller models, this change simplifies the upgrade model command greatly. Since `upgrade-controller` command used to invoke the `upgrade-model` command in a funky way, by bifurcating, we actually simplify both commands. ## QA steps - Bootstrap controller - Upgrade controller - Upgrade model - Use `--build-agent` on the `upgrade-controller` command too. ## Documentation changes - Can no longer upgrade a controller via upgrade-model. ## Links **Jira card:** JUJU-5439
2 parents 736110e + 21f34e0 commit 624175a

File tree

7 files changed

+1220
-509
lines changed

7 files changed

+1220
-509
lines changed

cmd/juju/commands/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ func registerCommands(r commandRegistry) {
399399
r.Register(model.NewModelGetConstraintsCommand())
400400
r.Register(model.NewModelSetConstraintsCommand())
401401
r.Register(newSyncAgentBinaryCommand())
402-
r.Register(newUpgradeJujuCommand())
402+
r.Register(newUpgradeModelCommand())
403403
r.Register(newUpgradeControllerCommand())
404404
r.Register(application.NewRefreshCommand())
405405
r.Register(application.NewSetApplicationBaseCommand())

0 commit comments

Comments
 (0)