Merge pull request #45 from n2h9/chore-add-namespace-resources-based-filtration

chore: add namespace, resources cli param to restrict snapshot to particular resources

Author: n2h9

cmd/meshsync/main.go

@@ -12,8 +12,9 @@ import (
 )
 
 func main() {
-	// var namespace string
-	// var outputFile string
+	var namespaces []string
+	var resources []string
+	var outputFile string
 	var duration time.Duration
 
 	// Root command for the plugin
@@ -34,14 +35,11 @@ func main() {
 			log.Info("startings meshsync lib...")
 			if err := libmeshsync.Run(
 				log,
-				// TODO
-				// add option to libmeshsync to specify
-				// (the functionality is in place, need to add corresponding WithXXX function):
-				// - output file name
-				// - k8s namespace
-				// - k8s resources list
 				libmeshsync.WithOutputMode("file"),
+				libmeshsync.WithOutputFileName(outputFile),
 				libmeshsync.WithStopAfterDuration(duration),
+				libmeshsync.WithOnlyK8sResources(resources),
+				libmeshsync.WithOnlyK8sNamespaces(namespaces...),
 			); err != nil {
 				return fmt.Errorf("error running meshsync lib %v", err)
 			}
@@ -51,9 +49,25 @@ func main() {
 		},
 	}
 
-	// rootCmd.Flags().StringVarP(&namespace, "namespace", "n", "", "namespace to make a snapshot of (if not specified collects events from all namespaces)")
-	// rootCmd.Flags().StringVarP(&outputFile, "outputFile", "o", "", "name of a result output file (if not specified produces file with name meshery-cluster-snapshot-YYYYMMDD-NN.yaml)")
-	rootCmd.Flags().DurationVarP(&duration, "duration", "d", 8*time.Second, "duration of event collection")
+	rootCmd.Flags().StringVarP(
+		&outputFile, "file", "f", "",
+		"Name of the output file.\nIf not specified, the file will be named: meshery-cluster-snapshot-YYYYMMDD-NN.yaml",
+	)
+
+	rootCmd.Flags().DurationVarP(
+		&duration, "duration", "d", 8*time.Second,
+		"Duration of event collection (e.g., 8ss, 12s, 1m)",
+	)
+
+	rootCmd.Flags().StringSliceVarP(
+		&resources, "resources", "r", []string{},
+		"Comma-separated list of Kubernetes resources to snapshot (case-insensitive).\nFor example: \"pod,deployment,service\"",
+	)
+
+	rootCmd.Flags().StringSliceVarP(
+		&namespaces, "namespace", "n", []string{},
+		"One or more namespaces to restrict the snapshot to.\nFor example: \"default,agile-otter\"\nIf not specified, events will be collected from all namespaces",
+	)
 
 	// Execute the command
 	if err := rootCmd.Execute(); err != nil {

go.mod

@@ -2,11 +2,11 @@ module github.com/meshery-extensions/kubectl-meshsync-snapshot
 
 go 1.24.0
 
-// replace github.com/meshery/meshsync@v0.8.21 ../meshsync
+// replace github.com/meshery/meshsync v0.8.22 => ../meshsync
 
 require (
 	github.com/layer5io/meshkit v0.8.24
-	github.com/meshery/meshsync v0.8.21
+	github.com/meshery/meshsync v0.8.22
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.9.1
 )

go.sum

@@ -239,8 +239,8 @@ github.com/meshery/meshery-operator v0.8.7 h1:SsiyDiPEcibYtoHlYyziwvCcBVfZOCJxq4
 github.com/meshery/meshery-operator v0.8.7/go.mod h1:hQEtFKKa5Fr/Mskk6bV5ip3bQ0+3F0u1voYS3XisBp4=
 github.com/meshery/meshkit v0.8.32 h1:zXyMLkOXcu2eIVcAxXBfw72vebpq4m8716RBYGhG1fM=
 github.com/meshery/meshkit v0.8.32/go.mod h1:Ym2z/5oSQn1jDQr+Qjmm9pBW7jv+8oXqp5+RYr9NXQI=
-github.com/meshery/meshsync v0.8.21 h1:w+qQ37YxIkIO4rudS3BRjZ7VMrDCFGNKVK/ucsx8j20=
-github.com/meshery/meshsync v0.8.21/go.mod h1:6D/aCTyK8+2VJNFnpJz1IdwvPsdV3ETEJo12VRKfY6I=
+github.com/meshery/meshsync v0.8.22 h1:uLymg+riXu7RmLSXo2CbVe02U/swGROJyMZAReQ8gBE=
+github.com/meshery/meshsync v0.8.22/go.mod h1:6D/aCTyK8+2VJNFnpJz1IdwvPsdV3ETEJo12VRKfY6I=
 github.com/meshery/schemas v0.8.22 h1:JQ7PoEheiXdkIG/h965L+DB7p/JdGEgs3i5r0EniSt4=
 github.com/meshery/schemas v0.8.22/go.mod h1:tuAmsG9WJRjZ0Iv12HIAhKZbWpfpkTRjfPNThKbr7HA=
 github.com/miekg/dns v1.1.57 h1:Jzi7ApEIzwEPLHWRcafCN9LZSBbqQpxjt/wpgvg7wcM=