Add an explicit --cleanup from command line

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
kubernetes-sigs · Dec 24, 2023 · d636b8f · d636b8f
1 parent 9562545
commit d636b8f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -25,6 +25,8 @@ $ bin/hydrophone --help
 Usage of bin/hydrophone:
   -busybox-image string
         specify an alternate busybox container image. (default "registry.k8s.io/e2e-test-images/busybox:1.36.1-1")
+  -cleanup
+        cleanup resources (pods, namespaces etc).
   -conformance
         run conformance tests.
   -conformance-image string

diff --git a/main.go b/main.go
@@ -36,13 +36,18 @@ func main() {
 	config, clientSet := service.Init(cfg)
 	client.ClientSet = clientSet
 
-	common.ValidateArgs(client.ClientSet, config, cfg)
+	common.PrintInfo(client.ClientSet, config)
 
-	service.RunE2E(client.ClientSet, cfg)
-	client.PrintE2ELogs()
-	client.FetchFiles(config, clientSet, cfg.OutputDir)
-	service.Cleanup(client.ClientSet)
+	if cfg.Cleanup {
+		service.Cleanup(client.ClientSet)
+	} else {
+		common.ValidateArgs(client.ClientSet, config, cfg)
 
+		service.RunE2E(client.ClientSet, cfg)
+		client.PrintE2ELogs()
+		client.FetchFiles(config, clientSet, cfg.OutputDir)
+		service.Cleanup(client.ClientSet)
+	}
 	log.Println("Exiting with code: ", client.ExitCode)
 	os.Exit(client.ExitCode)
 }
diff --git a/pkg/common/args.go b/pkg/common/args.go
@@ -61,6 +61,9 @@ type ArgConfig struct {
 
 	// DryRun to indicate whether to run ginkgo in dry run mode
 	DryRun bool
+
+	// Cleanup indicates we should just cleanup the resources
+	Cleanup bool
 }
 
 func InitArgs() (*ArgConfig, error) {
@@ -83,6 +86,7 @@ func InitArgs() (*ArgConfig, error) {
 	flag.StringVar(&cfg.OutputDir, "output-dir", outputDir, "directory for logs.")
 	flag.BoolVar(&cfg.ConformanceTests, "conformance", false, "run conformance tests.")
 	flag.BoolVar(&cfg.DryRun, "dry-run", false, "run in dry run mode.")
+	flag.BoolVar(&cfg.Cleanup, "cleanup", false, "cleanup resources (pods, namespaces etc).")
 
 	flag.Parse()
 
@@ -104,19 +108,21 @@ func InitArgs() (*ArgConfig, error) {
 	return &cfg, nil
 }
 
-func ValidateArgs(clientSet *kubernetes.Clientset, config *rest.Config, cfg *ArgConfig) {
+func PrintInfo(clientSet *kubernetes.Clientset, config *rest.Config) {
 	serverVersion, err := clientSet.ServerVersion()
 	if err != nil {
 		log.Fatal("Error fetching server version: ", err)
 	}
 
+	log.Printf("API endpoint : %s", config.Host)
+	log.Printf("Server version : %#v", *serverVersion)
+}
+
+func ValidateArgs(clientSet *kubernetes.Clientset, config *rest.Config, cfg *ArgConfig) {
 	if cfg.ConformanceTests {
 		cfg.Focus = "\\[Conformance\\]"
 	}
 
-	log.Printf("API endpoint : %s", config.Host)
-	log.Printf("Server version : %#v", *serverVersion)
-	log.Printf("Running tests : '%s'", cfg.Focus)
 	if cfg.Skip != "" {
 		log.Printf("Skipping tests : '%s'", cfg.Skip)
 	}