Unhide air gap and alphabetize flags (#1326)

replicatedhq · Oct 18, 2024 · 54eb50b · 54eb50b
1 parent 727e523
commit 54eb50b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 24 deletions.
diff --git a/cmd/embedded-cluster/install.go b/cmd/embedded-cluster/install.go
@@ -654,17 +654,19 @@ func installCommand() *cli.Command {
 					Usage:  fmt.Sprintf("Password for the Admin Console (minimum %d characters)", minAdminPasswordLength),
 					Hidden: false,
 				},
+				getAdminConsolePortFlag(runtimeConfig),
 				&cli.StringFlag{
-					Name:   "airgap-bundle",
-					Usage:  "Path to the air gap bundle. If set, the installation will complete without internet access.",
-					Hidden: true,
+					Name:  "airgap-bundle",
+					Usage: "Path to the air gap bundle. If set, the installation will complete without internet access.",
 				},
+				getDataDirFlag(runtimeConfig),
 				&cli.StringFlag{
 					Name:    "license",
 					Aliases: []string{"l"},
 					Usage:   "Path to the license file",
 					Hidden:  false,
 				},
+				getLocalArtifactMirrorPortFlag(runtimeConfig),
 				&cli.StringFlag{
 					Name:  "network-interface",
 					Usage: "The network interface to use for the cluster",
@@ -680,18 +682,15 @@ func installCommand() *cli.Command {
 					Usage:  "File with an EmbeddedClusterConfig object to override the default configuration",
 					Hidden: true,
 				},
+				&cli.StringSliceFlag{
+					Name:  "private-ca",
+					Usage: "Path to a trusted private CA certificate file",
+				},
 				&cli.BoolFlag{
 					Name:  "skip-host-preflights",
 					Usage: "Skip host preflight checks. This is not recommended.",
 					Value: false,
 				},
-				&cli.StringSliceFlag{
-					Name:  "private-ca",
-					Usage: "Path to a trusted private CA certificate file",
-				},
-				getDataDirFlag(runtimeConfig),
-				getAdminConsolePortFlag(runtimeConfig),
-				getLocalArtifactMirrorPortFlag(runtimeConfig),
 			},
 		)),
 		Action: func(c *cli.Context) error {

diff --git a/cmd/embedded-cluster/join.go b/cmd/embedded-cluster/join.go
@@ -135,9 +135,8 @@ var joinCommand = &cli.Command{
 	},
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:   "airgap-bundle",
-			Usage:  "Path to the air gap bundle. If set, the installation will complete without internet access.",
-			Hidden: true,
+			Name:  "airgap-bundle",
+			Usage: "Path to the air gap bundle. If set, the installation will complete without internet access.",
 		},
 		&cli.BoolFlag{
 			Name:   "enable-ha",

diff --git a/cmd/embedded-cluster/reset.go b/cmd/embedded-cluster/reset.go
@@ -342,6 +342,7 @@ func resetCommand() *cli.Command {
 		},
 		Args: false,
 		Flags: []cli.Flag{
+			getDataDirFlag(runtimeConfig),
 			&cli.BoolFlag{
 				Name:    "force",
 				Aliases: []string{"f"},
@@ -353,7 +354,6 @@ func resetCommand() *cli.Command {
 				Usage: "Disable interactive prompts",
 				Value: false,
 			},
-			getDataDirFlag(runtimeConfig),
 		},
 		Usage: fmt.Sprintf("Remove %s from the current node", binName),
 		Action: func(c *cli.Context) error {

diff --git a/cmd/embedded-cluster/restore.go b/cmd/embedded-cluster/restore.go
@@ -905,9 +905,15 @@ func restoreCommand() *cli.Command {
 		Flags: withProxyFlags(withSubnetCIDRFlags(
 			[]cli.Flag{
 				&cli.StringFlag{
-					Name:   "airgap-bundle",
-					Usage:  "Path to the air gap bundle. If set, the restore will complete without internet access.",
-					Hidden: true,
+					Name:  "airgap-bundle",
+					Usage: "Path to the air gap bundle. If set, the restore will complete without internet access.",
+				},
+				getDataDirFlag(runtimeConfig),
+				&cli.StringFlag{
+					Name:  "local-artifact-mirror-port",
+					Usage: "Port on which the Local Artifact Mirror will be served. If left empty, the port will be retrieved from the snapshot.",
+					// DefaultText: strconv.Itoa(ecv1beta1.DefaultLocalArtifactMirrorPort),
+					Hidden: false,
 				},
 				&cli.StringFlag{
 					Name:  "network-interface",
@@ -930,13 +936,6 @@ func restoreCommand() *cli.Command {
 					Value:  false,
 					Hidden: true,
 				},
-				&cli.StringFlag{
-					Name:  "local-artifact-mirror-port",
-					Usage: "Port on which the Local Artifact Mirror will be served. If left empty, the port will be retrieved from the snapshot.",
-					// DefaultText: strconv.Itoa(ecv1beta1.DefaultLocalArtifactMirrorPort),
-					Hidden: false,
-				},
-				getDataDirFlag(runtimeConfig),
 			},
 		)),
 		Before: func(c *cli.Context) error {