Add the --registry back to mgrpxy (bsc#1233202)

uyuni-project · Dec 13, 2024 · ea785f7 · ea785f7
1 parent f98118c
commit ea785f7
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 3 deletions.
diff --git a/mgradm/shared/utils/cmd_utils.go b/mgradm/shared/utils/cmd_utils.go
@@ -123,7 +123,7 @@ It will be used as SCC credentials for products synchronization and to pull imag
 // AddImageFlag add Image flags to a command.
 func AddImageFlag(cmd *cobra.Command) {
 	cmd.Flags().String("image", defaultImage, L("Image"))
-	cmd.Flags().String("registry", utils.DefaultRegistry, L("Specify a private registry where pull the images"))
+	cmd.Flags().String("registry", utils.DefaultRegistry, L("Specify a registry where to pull the images from"))
 	cmd.Flags().String("tag", utils.DefaultTag, L("Tag Image"))
 
 	utils.AddPullPolicyFlag(cmd)

diff --git a/mgrpxy/cmd/upgrade/kubernetes/kubernetes_test.go b/mgrpxy/cmd/upgrade/kubernetes/kubernetes_test.go
@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: 2024 SUSE LLC
 //
 // SPDX-License-Identifier: Apache-2.0
-//go:build ptf
 
 package kubernetes
 

diff --git a/mgrpxy/cmd/upgrade/podman/podman_test.go b/mgrpxy/cmd/upgrade/podman/podman_test.go
@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: 2024 SUSE LLC
 //
 // SPDX-License-Identifier: Apache-2.0
-//go:build ptf
 
 package podman
 

diff --git a/mgrpxy/shared/utils/flags.go b/mgrpxy/shared/utils/flags.go
@@ -76,6 +76,7 @@ func AddSCCFlag(cmd *cobra.Command) {
 // AddImageFlags will add the proxy install flags to a command.
 func AddImageFlags(cmd *cobra.Command) {
 	cmd.Flags().String("tag", utils.DefaultTag, L("image tag"))
+	cmd.Flags().String("registry", utils.DefaultRegistry, L("Specify a registry where to pull the images from"))
 	utils.AddPullPolicyFlag(cmd)
 
 	addContainerImageFlags(cmd, "httpd", "httpd")

diff --git a/shared/testutils/flagstests/mgrpxy_kubernetes.go b/shared/testutils/flagstests/mgrpxy_kubernetes.go
@@ -30,6 +30,7 @@ func AssertProxyHelmFlags(t *testing.T, flags *kubernetes.HelmFlags) {
 
 // ImageProxyFlagsTestArgs is the slice of parameters to use with AssertImageFlags.
 var ImageProxyFlagsTestArgs = []string{
+	"--registry", "myregistry.com",
 	"--tag", "v1.2.3",
 	"--pullPolicy", "never",
 	"--httpd-image", "path/to/httpd",
@@ -48,6 +49,7 @@ var ImageProxyFlagsTestArgs = []string{
 
 // AssertProxyImageFlags checks that all image flags are parsed correctly.
 func AssertProxyImageFlags(t *testing.T, flags *utils.ProxyImageFlags) {
+	testutils.AssertEquals(t, "Error parsing --registry", "myregistry.com", flags.Registry)
 	testutils.AssertEquals(t, "Error parsing --tag", "v1.2.3", flags.Tag)
 	testutils.AssertEquals(t, "Error parsing --pullPolicy", "never", flags.PullPolicy)
 	testutils.AssertEquals(t, "Error parsing --httpd-image", "path/to/httpd", flags.Httpd.Name)

diff --git a/uyuni-tools.changes.cbosdo.proxy-registry b/uyuni-tools.changes.cbosdo.proxy-registry
@@ -0,0 +1 @@
+- Add --registry back to mgrpxy (bsc#1233202)