finalized

Signed-off-by: Arnob Kumar Saha <arnob@appscode.com>

Author: ArnobKumarSaha

client-org/active/org1.txt

@@ -16,9 +16,16 @@ limitations under the License.
 
 package clientorg
 
-import "gomodules.xyz/go-sh"
+import (
+	"gomodules.xyz/go-sh"
+	"k8s.io/klog/v2"
+)
 
 func (g *clientOrgOpts) cleanup() error {
+	if !g.clean || g.mode == modeActive {
+		return nil
+	}
+	klog.Infof("Cleaning up gw resources from %v(mode) organizations", g.mode)
 	for _, org := range g.terminatingOrganizations {
 		if !org.gwNamespace {
 			continue

pkg/cmds/debug/clientorg/cleanup.go

@@ -72,33 +72,35 @@ func NewCmdClientOrg(f cmdutil.Factory) *cobra.Command {
 			if opt.dir == "" {
 				opt.dir = "client-org"
 			}
-			klog.Infof("The debug into will be generated in current directory under '%s' folder", opt.dir)
+			klog.Infof("The debug info will be generated in current directory under '%s' folder", opt.dir)
 			return opt.run()
 		},
 	}
 
 	cmd.Flags().StringVarP(&opt.org, "name", "m", "", "Client org name")
+	cmd.Flags().StringVarP(&opt.mode, "mode", "d", "terminating", "Possible values: 'active', 'terminating' or 'both'. Default is terminating")
+	cmd.Flags().BoolVarP(&opt.clean, "cleanup", "c", true, "cleanup should happen or not")
 	return cmd
 }
 
 type clientOrgOpts struct {
 	kc         client.Client
 	config     *rest.Config
 	kubeClient kubernetes.Interface
-	org        string
-	dir        string
 
 	activeOrganizations      []resourceGroup
 	terminatingOrganizations []resourceGroup
+
+	org   string
+	mode  string
+	dir   string
+	clean bool
 }
 
 type resourceGroup struct {
 	clientOrgName       string
 	gwNamespace         bool
 	monitoringNamespace bool
-	mainResources       string
-	gwResources         string
-	monitoringResources string
 }
 
 func newClientOrgOpts(f cmdutil.Factory) *clientOrgOpts {
@@ -133,17 +135,21 @@ func (g *clientOrgOpts) run() error {
 		return err
 	}
 
+	klog.Infof("[[ Values passed: --name=%v, --mode=%v, --cleanup=%v ]]", g.org, g.mode, g.clean)
 	if err := g.collectNamespaces(); err != nil {
 		return err
 	}
 
-	klog.Infof("Collecting all resources from clientOrg namespaces")
+	orgName := g.org
+	if orgName == "" {
+		orgName = "all"
+	}
+	klog.Infof("Collecting resources from %v clientOrg namespace", orgName)
 	err = g.collectAllResources()
 	if err != nil {
 		return err
 	}
 
-	klog.Infof("Cleaning up gw resources from terminating organizations")
 	err = g.cleanup()
 	return err
 }

pkg/cmds/debug/clientorg/client-org.go

@@ -29,12 +29,12 @@ import (
 )
 
 const (
-	logsDir  = "logs"
-	yamlsDir = "yamls"
 	dirPerm  = 0o755
 	filePerm = 0o644
 
-	kubectlCommand = "kubectl"
+	kubectlCommand  = "kubectl"
+	modeActive      = "active"
+	modeTerminating = "terminating"
 )
 
 var (
@@ -73,13 +73,16 @@ func (g *clientOrgOpts) collectNamespaces() error {
 	}
 
 	for _, ns := range nsList.Items {
+		if g.org != "" && ns.Name != g.org { // if ran for specific org, ignore all other ones.
+			continue
+		}
 		if val, exists := ns.Labels[kmapi.ClientOrgKey]; exists {
 			rg := constructResourceGroup(ns.Name)
 
 			switch val {
 			case "true":
 				g.activeOrganizations = append(g.activeOrganizations, rg)
-			case "terminating":
+			case modeTerminating:
 				g.terminatingOrganizations = append(g.terminatingOrganizations, rg)
 			}
 		}
@@ -106,28 +109,32 @@ func getResourceHeader(res string) []byte {
 }
 
 func (g *clientOrgOpts) collectAllResources() error {
-	//err := os.MkdirAll(path.Join(g.dir, "active"), dirPerm)
-	//if err != nil {
-	//	return err
-	//}
-	//
-	//for _, org := range g.activeOrganizations {
-	//	err := g.collectForOneOrg(org, path.Join(g.dir, "active"))
-	//	if err != nil {
-	//		return err
-	//	}
-	//}
-
-	err := os.MkdirAll(path.Join(g.dir, "terminating"), dirPerm)
-	if err != nil {
-		return err
+	if g.mode == "both" || g.mode == modeActive {
+		err := os.MkdirAll(path.Join(g.dir, modeActive), dirPerm)
+		if err != nil {
+			return err
+		}
+
+		for _, org := range g.activeOrganizations {
+			err := g.collectForOneOrg(org, path.Join(g.dir, modeActive))
+			if err != nil {
+				return err
+			}
+		}
 	}
 
-	for _, org := range g.terminatingOrganizations {
-		err := g.collectForOneOrg(org, path.Join(g.dir, "terminating"))
+	if g.mode == "both" || g.mode == modeTerminating {
+		err := os.MkdirAll(path.Join(g.dir, modeTerminating), dirPerm)
 		if err != nil {
 			return err
 		}
+
+		for _, org := range g.terminatingOrganizations {
+			err := g.collectForOneOrg(org, path.Join(g.dir, modeTerminating))
+			if err != nil {
+				return err
+			}
+		}
 	}
 	return nil
 }
@@ -193,7 +200,9 @@ func (g *clientOrgOpts) writeContent(groupDir, fileName string, content []byte)
 	if err != nil {
 		return err
 	}
-	defer f.Close()
+	defer func(f *os.File) {
+		_ = f.Close()
+	}(f)
 
 	_, err = f.Write(content)
 	if err != nil {