cleanup the wiretap container specific to the broker in case of tmctl stop (#333)

Signed-off-by: Nikhil Sharma <nikhilsharma230303@gmail.com>

Author: NikhilSharmaWe

cmd/stop/stop.go

@@ -72,6 +72,11 @@ func (o *CliOptions) stop() error {
 			continue
 		}
 		if object.Kind == tmbroker.BrokerKind {
+			wiretapContainerName := object.Metadata.Name + "-wiretap"
+			if err := docker.ForceStop(ctx, wiretapContainerName, client); err != nil {
+				log.Printf("Stopping %q: %v", wiretapContainerName, err)
+			}
+
 			object.Metadata.Name += "-broker"
 		}
 		log.Printf("Stopping %s\n", object.Metadata.Name)

cmd/watch/watch.go

@@ -22,10 +22,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"net"
 	"os"
 	"os/signal"
 	"strings"
 	"syscall"
+	"time"
 
 	"github.com/spf13/cobra"
 
@@ -72,6 +74,7 @@ func NewCmd(config *config.Config) *cobra.Command {
 func (o *CliOptions) watch() error {
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
+	defer close(c)
 
 	ctx := context.Background()
 
@@ -99,6 +102,8 @@ func (o *CliOptions) watch() error {
 	log.Println("Watching...")
 	go listenBroker(brokerLogs, c)
 	go listenEvents(eventDisplayLogs, c)
+	go checkConnectivity(w.Destination, c)
+
 	<-c
 	log.Println("Cleaning up")
 	return nil
@@ -142,3 +147,21 @@ func readLogs(output io.ReadCloser, done chan os.Signal, handler func([]byte)) {
 		}
 	}
 }
+
+func checkConnectivity(destination string, done chan os.Signal) {
+	port := strings.TrimPrefix(destination, "http://host.docker.internal")
+	ticker := time.NewTicker(3 * time.Second)
+	defer ticker.Stop()
+	for {
+		select {
+		case <-done:
+			return
+		case <-ticker.C:
+			if _, err := net.Dial("tcp", "localhost"+port); err != nil {
+				log.Printf("Wiretap container is unreachable: %v", err)
+				done <- syscall.SIGTERM
+				return
+			}
+		}
+	}
+}

docs/tmctl.md

@@ -12,7 +12,7 @@ Find more information at: https://docs.triggermesh.io
 
 ```
   -h, --help             help for tmctl
-      --version string   TriggerMesh components version. (default "v1.25.0")
+      --version string   TriggerMesh components version. (default "v1.25.1")
 ```
 
 ### SEE ALSO

docs/tmctl_brokers.md

@@ -16,7 +16,7 @@ tmctl brokers [--set <broker>] [flags]
 ### Options inherited from parent commands
 
 ```
-      --version string   TriggerMesh components version. (default "v1.25.0")
+      --version string   TriggerMesh components version. (default "v1.25.1")
 ```
 
 ### SEE ALSO

docs/tmctl_config.md

@@ -15,7 +15,7 @@ tmctl config [set|get] [flags]
 ### Options inherited from parent commands
 
 ```
-      --version string   TriggerMesh components version. (default "v1.25.0")
+      --version string   TriggerMesh components version. (default "v1.25.1")
 ```
 
 ### SEE ALSO

docs/tmctl_config_get.md

@@ -15,7 +15,7 @@ tmctl config get [key] [flags]
 ### Options inherited from parent commands
 
 ```
-      --version string   TriggerMesh components version. (default "v1.25.0")
+      --version string   TriggerMesh components version. (default "v1.25.1")
 ```
 
 ### SEE ALSO

docs/tmctl_config_set.md

@@ -15,7 +15,7 @@ tmctl config set <key> <value> [flags]
 ### Options inherited from parent commands
 
 ```
-      --version string   TriggerMesh components version. (default "v1.25.0")
+      --version string   TriggerMesh components version. (default "v1.25.1")
 ```
 
 ### SEE ALSO

docs/tmctl_create.md

@@ -11,7 +11,7 @@ Create TriggerMesh component
 ### Options inherited from parent commands
 
 ```
-      --version string   TriggerMesh components version. (default "v1.25.0")
+      --version string   TriggerMesh components version. (default "v1.25.1")
 ```
 
 ### SEE ALSO

docs/tmctl_create_source.md

@@ -25,7 +25,7 @@ tmctl create source httppoller \
 ### Options inherited from parent commands
 
 ```
-      --version string   TriggerMesh components version. (default "v1.25.0")
+      --version string   TriggerMesh components version. (default "v1.25.1")
 ```
 
 ### SEE ALSO

docs/tmctl_create_target.md

@@ -24,7 +24,7 @@ tmctl create target http \
 ### Options inherited from parent commands
 
 ```
-      --version string   TriggerMesh components version. (default "v1.25.0")
+      --version string   TriggerMesh components version. (default "v1.25.1")
 ```
 
 ### SEE ALSO