Merge pull request #80 from dgeorgievski/fix-porchctl-cmds

Porchctl repo command fixes
nephio-project · Nov 14, 2024 · a974d65 · a974d65
2 parents a69870d + 1152765
commit a974d65
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/pkg/cli/commands/repo/get/command.go b/pkg/cli/commands/repo/get/command.go
@@ -79,6 +79,13 @@ func (r *runner) preRunE(cmd *cobra.Command, _ []string) error {
 	} else {
 		r.requestTable = true
 	}
+
+	allNamespacesFlag := cmd.Flags().Lookup("all-namespaces").Value.String()
+	if strings.Contains(allNamespacesFlag, "true") {
+		r.printFlags.HumanReadableFlags.WithNamespace = true
+	} else {
+		r.printFlags.HumanReadableFlags.WithNamespace = false
+	}
 	return nil
 }
 

diff --git a/pkg/cli/commands/repo/reg/command.go b/pkg/cli/commands/repo/reg/command.go
@@ -88,6 +88,17 @@ type runner struct {
 
 func (r *runner) preRunE(_ *cobra.Command, _ []string) error {
 	const op errors.Op = command + ".preRunE"
+
+	// todo if namespace flag missing, use kubeconfig
+	if *r.cfg.Namespace == "" {
+		// Get the namespace from kubeconfig
+		namespace, _, err := r.cfg.ToRawKubeConfigLoader().Namespace()
+		if err != nil {
+			return fmt.Errorf("error getting namespace: %w", err)
+		}
+		r.cfg.Namespace = &namespace
+	}
+
 	client, err := porch.CreateClientWithFlags(r.cfg)
 	if err != nil {
 		return errors.E(op, err)

diff --git a/pkg/cli/commands/repo/unreg/command.go b/pkg/cli/commands/repo/unreg/command.go
@@ -71,6 +71,16 @@ type runner struct {
 
 func (r *runner) preRunE(_ *cobra.Command, _ []string) error {
 	const op errors.Op = command + ".preRunE"
+
+	if *r.cfg.Namespace == "" {
+		// Get the namespace from kubeconfig
+		namespace, _, err := r.cfg.ToRawKubeConfigLoader().Namespace()
+		if err != nil {
+			return fmt.Errorf("error getting namespace: %w", err)
+		}
+		r.cfg.Namespace = &namespace
+	}
+
 	client, err := porch.CreateClientWithFlags(r.cfg)
 	if err != nil {
 		return errors.E(op, err)