summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keadm/cmd/keadm/app/cmd/edge/upgrade.go5
-rw-r--r--keadm/cmd/keadm/app/cmd/upgrade.go9
2 files changed, 8 insertions, 6 deletions
diff --git a/keadm/cmd/keadm/app/cmd/edge/upgrade.go b/keadm/cmd/keadm/app/cmd/edge/upgrade.go
index c672b384c..46969da1e 100644
--- a/keadm/cmd/keadm/app/cmd/edge/upgrade.go
+++ b/keadm/cmd/keadm/app/cmd/edge/upgrade.go
@@ -51,7 +51,7 @@ func NewEdgeUpgrade() *cobra.Command {
Long: "Upgrade edge components. Upgrade the edge node to the desired version.",
RunE: func(cmd *cobra.Command, args []string) error {
// upgrade edgecore
- return upgradeOptions.upgrade()
+ return upgradeOptions.Upgrade()
},
}
@@ -68,7 +68,8 @@ func NewUpgradeOptions() *UpgradeOptions {
return opts
}
-func (up *UpgradeOptions) upgrade() error {
+// Upgrade handles upgrade command logic
+func (up *UpgradeOptions) Upgrade() error {
// get EdgeCore configuration from edgecore.yaml config file
data, err := os.ReadFile(up.Config)
if err != nil {
diff --git a/keadm/cmd/keadm/app/cmd/upgrade.go b/keadm/cmd/keadm/app/cmd/upgrade.go
index 6ad2c0e44..1dd7b1322 100644
--- a/keadm/cmd/keadm/app/cmd/upgrade.go
+++ b/keadm/cmd/keadm/app/cmd/upgrade.go
@@ -13,6 +13,7 @@ Specify whether to upgrade the cloud or the edge through three-level commands.
If no three-level command, it upgrades edge components.`
)
+// NewUpgradeCommand creates a upgrade command instance and returns it.
func NewUpgradeCommand() *cobra.Command {
cmds := &cobra.Command{
Use: "upgrade",
@@ -20,15 +21,15 @@ func NewUpgradeCommand() *cobra.Command {
Long: upgradeLongDescription,
}
- edgecmd := edge.NewEdgeUpgrade()
-
// Used for backward compatibility of the edgecore trigger the upgrade command
upgradeOptions := edge.NewUpgradeOptions()
+ cmds.RunE = func(cmd *cobra.Command, args []string) error {
+ return upgradeOptions.Upgrade()
+ }
edge.AddUpgradeFlags(cmds, upgradeOptions)
- cmds.RunE = edgecmd.RunE
// Register three-level commands
- cmds.AddCommand(edgecmd)
+ cmds.AddCommand(edge.NewEdgeUpgrade())
cmds.AddCommand(cloud.NewCloudUpgrade())
return cmds
}