Remove useless --mirror flag in kubernetes install command

uyuni-project · Jan 9, 2025 · b22d247 · b22d247
1 parent 3a71298
commit b22d247
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/mgradm/cmd/install/podman/podman.go b/mgradm/cmd/install/podman/podman.go
@@ -42,6 +42,7 @@ NOTE: installing on a remote podman is not supported yet!
 		},
 	}
 
+	adm_utils.AddMirrorFlag(cmd)
 	shared.AddInstallFlags(cmd)
 	podman.AddPodmanArgFlag(cmd)
 

diff --git a/mgradm/cmd/install/podman/podman_test.go b/mgradm/cmd/install/podman/podman_test.go
@@ -17,13 +17,15 @@ import (
 
 func TestParamsParsing(t *testing.T) {
 	args := flagstests.InstallFlagsTestArgs()
+	args = append(args, flagstests.MirrorFlagTestArgs...)
 	args = append(args, flagstests.PodmanFlagsTestArgs...)
 	args = append(args, "srv.fq.dn")
 
 	// Test function asserting that the args are properly parsed
 	tester := func(_ *types.GlobalFlags, flags *podmanInstallFlags,
 		_ *cobra.Command, args []string,
 	) error {
+		flagstests.AssertMirrorFlag(t, flags.Mirror)
 		flagstests.AssertInstallFlags(t, &flags.ServerFlags)
 		flagstests.AssertPodmanInstallFlags(t, &flags.Podman)
 		testutils.AssertEquals(t, "Wrong FQDN", "srv.fq.dn", args[0])

diff --git a/mgradm/cmd/install/shared/flags.go b/mgradm/cmd/install/shared/flags.go
@@ -20,7 +20,6 @@ func AddInspectFlags(cmd *cobra.Command) {
 
 // AddInstallFlags add flags to installa command.
 func AddInstallFlags(cmd *cobra.Command) {
-	cmd_utils.AddMirrorFlag(cmd)
 	cmd.Flags().String("tz", "", L("Time zone to set on the server. Defaults to the host timezone"))
 	cmd.Flags().String("email", "[email protected]", L("Administrator e-mail"))
 	cmd.Flags().String("emailfrom", "[email protected]", L("E-Mail sending the notifications"))

diff --git a/shared/testutils/flagstests/mgradm_install.go b/shared/testutils/flagstests/mgradm_install.go
@@ -46,7 +46,6 @@ var InstallFlagsTestArgs = func() []string {
 		"--organization", "someorg",
 	}
 
-	args = append(args, MirrorFlagTestArgs...)
 	args = append(args, SCCFlagTestArgs...)
 	args = append(args, ImageFlagsTestArgs...)
 	args = append(args, CocoFlagsTestArgs...)
@@ -96,7 +95,6 @@ func AssertInstallFlags(t *testing.T, flags *utils.ServerFlags) {
 	testutils.AssertEquals(t, "Error parsing --admin-firstName", "adminfirst", flags.Installation.Admin.FirstName)
 	testutils.AssertEquals(t, "Error parsing --admin-lastName", "adminlast", flags.Installation.Admin.LastName)
 	testutils.AssertEquals(t, "Error parsing --organization", "someorg", flags.Installation.Organization)
-	AssertMirrorFlag(t, flags.Mirror)
 	AssertSCCFlag(t, &flags.Installation.SCC)
 	AssertImageFlag(t, &flags.Image)
 	AssertCocoFlag(t, &flags.Coco)
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,7 @@ NOTE: installing on a remote podman is not supported yet! @@
     		},
     	}
+    	adm_utils.AddMirrorFlag(cmd)
     	shared.AddInstallFlags(cmd)
     	podman.AddPodmanArgFlag(cmd)
@@ Expand Down @@